WIP: Add patch for fixing the configure.ac SynoCommunity#5795

vitkabele · Jul 14, 2023 · dee6598 · dee6598
1 parent 904adb3
commit dee6598
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 4 deletions.
diff --git a/cross/firebird/Makefile b/cross/firebird/Makefile
@@ -2,7 +2,7 @@ PKG_NAME = firebird
 PKG_VERS = 4.0.2
 PKG_EXT = tar.gz
 PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = https://github.com/$(PKG_NAME)/firebird/archive/refs/tags/
+PKG_DIST_SITE = https://github.com/FirebirdSQL/firebird/archive/refs/tags/
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
 DEPENDS = cross/zlib cross/libicu
@@ -23,13 +23,14 @@ LICENSE  = MPL
 GNU_CONFIGURE = 1
 PRE_CONFIGURE_TARGET = firebird_pre_configure
 
-CONFIGURE_ARGS = --host=$(TC_TARGET) --with-builtin-tommath --with-builtin-tomcrypt --without-termlib
-CONFIGURE_ARGS += ac_cv_func_setpgrp_void=yes ac_cv_sys_file_offset_bits=yes ac_cv_func_sem_init=no
+CONFIGURE_ARGS = --with-builtin-tommath --with-builtin-tomcrypt --without-termlib --disable-binreloc
+CONFIGURE_ARGS += ac_cv_func_setpgrp_void=yes 
+CONFIGURE_ARGS += ac_cv_sys_file_offset_bits=yes ac_cv_func_sem_init=no ac_cv_file_proc_self_exe=yes
 
 include ../../mk/spksrc.cross-cc.mk
 
 .PHONY: firebird_pre_configure
 firebird_pre_configure:
-	$(RUN) WORKING_SEM_INIT=1 ./autogen.sh $(CONFIGURE_ARGS)
+	$(RUN) NOCONFIGURE=true ./autogen.sh
 
 
diff --git a/cross/firebird/patches/0001-fix-configure-ac.patch b/cross/firebird/patches/0001-fix-configure-ac.patch
@@ -0,0 +1,37 @@
+--- firebird-4.0.2/configure.ac	2022-08-08 02:08:06.000000000 +0200
++++ configure.ac	2023-07-14 14:53:15.032933905 +0200
+@@ -1131,7 +1131,7 @@ main () {
+     union { long long x; sem_t y; } b;
+   };
+   return (int)&((struct s*)0)->b;
+-}]])],[ac_cv_c_alignment=$ac_status],[ac_cv_c_alignment=$ac_status],[])
++}]])],[ac_cv_c_alignment=$ac_status],[ac_cv_c_alignment=$ac_status],[ac_cv_c_alignment=8])
+ AC_MSG_RESULT($ac_cv_c_alignment)
+ AC_DEFINE_UNQUOTED(FB_ALIGNMENT, $ac_cv_c_alignment, [Alignment of long])
+
+@@ -1142,7 +1142,7 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[main ()
+     double b;
+   };
+   return (int)&((struct s*)0)->b;
+-}]])],[ac_cv_c_double_align=$ac_status],[ac_cv_c_double_align=$ac_status],[])
++}]])],[ac_cv_c_double_align=$ac_status],[ac_cv_c_double_align=$ac_status],[ac_cv_c_double_align=8])
+ AC_MSG_RESULT($ac_cv_c_double_align)
+ AC_DEFINE_UNQUOTED(FB_DOUBLE_ALIGN, $ac_cv_c_double_align, [Alignment of double])
+
+@@ -1160,6 +1160,7 @@ static int abs64Compare(SINT64 n1, SINT6
+ int main() {
+ 	return abs64Compare(-9223372036854775808, 3652058) == 1 ? 0 : 1;
+ }]])],[ac_cv_compare_failed=0
++ac_cv_compare_result=success],[],[ac_cv_compare_failed=0
+ ac_cv_compare_result=success])
+ CFLAGS="$savedflags"
+ AC_MSG_RESULT($ac_cv_compare_result)
+@@ -1170,7 +1171,7 @@ case "$PLATFORM" in
+   LINUX)
+     dnl MOD: Check for /proc/self/exe mainly used on linux systems
+     dnl      this is used to determine path to executable file.
+-    AC_CHECK_FILES(/proc/self/exe)
++    dnl AC_CHECK_FILES(/proc/self/exe)
+     ;;
+
+   FREEBSD|GENTOOFREEBSD)