Hello community, here is the log from the commit of package firebird for openSUSE:Factory checked in at 2013-06-05 11:51:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/firebird (Old) and /work/SRC/openSUSE:Factory/.firebird.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "firebird" Changes: -------- --- /work/SRC/openSUSE:Factory/firebird/firebird-classic.changes 2013-03-08 21:03:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.firebird.new/firebird-classic.changes 2013-06-05 11:51:29.000000000 +0200 @@ -1,0 +2,37 @@ +Sun Jun 2 19:15:12 UTC 2013 - [email protected] + +- resolve file conflicts between packages + * add explicit mutual conflict between -superserver and -classic + * remove fbguard from -classic (it is shared between SS and SC) + +------------------------------------------------------------------- +Fri Apr 12 14:48:56 UTC 2013 - [email protected] + +- config-guess-sub-update.patch: + remove; attempt to patch these files would break build from + subversion snapshots; remove both files instead and let + libtoolize provide its own version +- reorder patches to keep the isql column alignment feature last + +------------------------------------------------------------------- +Mon Apr 8 08:15:19 UTC 2013 - [email protected] + +- firebird-fix-unsigned-char.diff: + Compile with -fsigned-char + +------------------------------------------------------------------- +Mon Apr 8 01:10:47 UTC 2013 - [email protected] + +- firebird-fix-unsigned-char.diff: + fix for architectures where char is unsigned (aarch64 in this + case, but applies everywhere) +- aarch64-support.patch: + aarch64 doesn't need RISC_ALIGNMENT + +------------------------------------------------------------------- +Sun Mar 24 09:42:59 UTC 2013 - [email protected] + +- config-guess-sub-update.patch: update config.guess/sub for aarch64 +- aarch64-support.patch: add support for aarch64 + +------------------------------------------------------------------- firebird.changes: same change New: ---- aarch64-support.patch firebird-fix-unsigned-char.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ firebird-classic.spec ++++++ --- /var/tmp/diff_new_pack.5yYXnG/_old 2013-06-05 11:51:30.000000000 +0200 +++ /var/tmp/diff_new_pack.5yYXnG/_new 2013-06-05 11:51:30.000000000 +0200 @@ -38,6 +38,7 @@ %ifnarch %{ix86} x86_64 BuildRequires: libatomic-ops-devel %endif +Conflicts: %{bname}-superserver Requires(pre): pwdutils Requires: %{bname} = %{version} Provides: %{bname}-server @@ -55,6 +56,8 @@ Patch9: ppc64-libdir.patch Patch10: %{bname}-2.5.2-icu49.patch Patch11: %{bname}-2.5.2-CORE-4058.patch +Patch12: aarch64-support.patch +Patch13: firebird-fix-unsigned-char.diff Patch21: %{bname}-2.5.2-isqlalign.patch Patch22: %{bname}-2.5.2-isqllocale.patch Patch23: %{bname}-2.5.2-isqlwidth.patch @@ -84,11 +87,14 @@ %patch9 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 +%patch13 -p1 %patch21 -p1 %patch22 -p1 %patch23 -p1 %build +rm -vf builds/make.new/config/config.{guess,sub} ./autogen.sh --prefix=%{_prefix} \ --with-system-icu --with-system-editline \ --with-fbbin=%{_bindir} --with-fbsbin=%{_sbindir} \ @@ -125,6 +131,7 @@ cp -v gen/install/misc/*.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/ cd ${RPM_BUILD_ROOT} rm -vf .%{_sbindir}/*.sh +rm -vf .%{_sbindir}/fbguard rm -vf .%{_sbindir}/fb_config mv -v .%{_bindir}/isql .%{_bindir}/isql-fb mv -v .%{_bindir}/gstat .%{_bindir}/gstat-fb ++++++ firebird.spec ++++++ --- /var/tmp/diff_new_pack.5yYXnG/_old 2013-06-05 11:51:30.000000000 +0200 +++ /var/tmp/diff_new_pack.5yYXnG/_new 2013-06-05 11:51:30.000000000 +0200 @@ -54,6 +54,8 @@ Patch9: ppc64-libdir.patch Patch10: %{name}-2.5.2-icu49.patch Patch11: %{name}-2.5.2-CORE-4058.patch +Patch12: aarch64-support.patch +Patch13: firebird-fix-unsigned-char.diff Patch21: %{name}-2.5.2-isqlalign.patch Patch22: %{name}-2.5.2-isqllocale.patch Patch23: %{name}-2.5.2-isqlwidth.patch @@ -78,11 +80,14 @@ %patch9 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 +%patch13 -p1 %patch21 -p1 %patch22 -p1 %patch23 -p1 %build +rm -vf builds/make.new/config/config.{guess,sub} ./autogen.sh --prefix=%{_prefix} \ --enable-superserver \ --with-system-icu --with-system-editline \ @@ -183,6 +188,7 @@ # ---------------------------------------------------------------------------- %package superserver +Conflicts: %{name}-classic Requires: %{name} = %{version} Provides: %{name}-server Summary: SuperServer architecture binaries for Firebird SQL server ++++++ aarch64-support.patch ++++++ Index: Firebird-2.5.2.26539-0/configure.in =================================================================== --- Firebird-2.5.2.26539-0.orig/configure.in +++ Firebird-2.5.2.26539-0/configure.in @@ -304,6 +304,16 @@ dnl CPU_TYPE=ppc64 SHRLIB_EXT=so ;; + aarch64-*-linux*) + MAKEFILE_PREFIX=linux_generic + INSTALL_PREFIX=linux + PLATFORM=LINUX + AC_DEFINE(LINUX, 1, [Define this if OS is Linux]) + EDITLINE_FLG=Y + SHRLIB_EXT=so + libdir=/usr/lib64 + ;; + *-*-linux* | *-*-gnu*) MAKEFILE_PREFIX=linux_generic INSTALL_PREFIX=linux Index: Firebird-2.5.2.26539-0/src/jrd/common.h =================================================================== --- Firebird-2.5.2.26539-0.orig/src/jrd/common.h +++ Firebird-2.5.2.26539-0/src/jrd/common.h @@ -192,6 +192,10 @@ #define RISC_ALIGNMENT #endif /* alpha */ +#ifdef __aarch64__ +#define IMPLEMENTATION isc_info_db_impl_linux_aarch64 /* 84 */ +#endif /* alpha */ + #endif /* LINUX */ Index: Firebird-2.5.2.26539-0/src/jrd/inf_pub.h =================================================================== --- Firebird-2.5.2.26539-0.orig/src/jrd/inf_pub.h +++ Firebird-2.5.2.26539-0/src/jrd/inf_pub.h @@ -215,6 +215,7 @@ enum info_db_implementations isc_info_db_impl_linux_sheb = 81, isc_info_db_impl_linux_hppa = 82, isc_info_db_impl_linux_alpha = 83, + isc_info_db_impl_linux_aarch64 = 84, isc_info_db_impl_last_value // Leave this LAST! }; Index: Firebird-2.5.2.26539-0/src/jrd/pag.cpp =================================================================== --- Firebird-2.5.2.26539-0.orig/src/jrd/pag.cpp +++ Firebird-2.5.2.26539-0/src/jrd/pag.cpp @@ -162,9 +162,10 @@ static const int CLASS_LINUX_SH = 38; / static const int CLASS_LINUX_SHEB = 39; // LINUX/SH (big-endian) static const int CLASS_LINUX_HPPA = 40; // LINUX/HPPA static const int CLASS_LINUX_ALPHA = 41; // LINUX/ALPHA +static const int CLASS_LINUX_AARCH64 = 42; // LINUX/AARCH64 static const int CLASS_MAX10 = CLASS_LINUX_AMD64; // This should not be changed, no new ports with ODS10 -static const int CLASS_MAX = CLASS_LINUX_ALPHA; +static const int CLASS_MAX = CLASS_LINUX_AARCH64; // ARCHITECTURE COMPATIBILITY CLASSES @@ -263,7 +264,8 @@ static const ArchitectureType archMatrix archLittleEndian, // CLASS_LINUX_SH archBigEndian, // CLASS_LINUX_SHEB archBigEndian, // CLASS_LINUX_HPPA - archLittleEndian // CLASS_LINUX_ALPHA + archLittleEndian, // CLASS_LINUX_ALPHA + archLittleEndian // CLASS_LINUX_AARCH64 }; #ifdef __sun @@ -327,6 +329,8 @@ const SSHORT CLASS = CLASS_LINUX_SHEB; const SSHORT CLASS = CLASS_LINUX_HPPA; #elif defined(ALPHA) const SSHORT CLASS = CLASS_LINUX_ALPHA; +#elif defined(__aarch64__) +const SSHORT CLASS = CLASS_LINUX_AARCH64; #else #error no support on other hardware for Linux #endif Index: Firebird-2.5.2.26539-0/src/jrd/utl.cpp =================================================================== --- Firebird-2.5.2.26539-0.orig/src/jrd/utl.cpp +++ Firebird-2.5.2.26539-0/src/jrd/utl.cpp @@ -227,7 +227,8 @@ static const TEXT* const impl_implementa "Firebird/linux SH", // 80 "Firebird/linux SHEB", // 81 "Firebird/linux HPPA", // 82 - "Firebird/linux ALPHA" // 83 + "Firebird/linux ALPHA", // 83 + "Firebird/linux AARCH64" // 84 }; ++++++ firebird-fix-unsigned-char.diff ++++++ Index: Firebird-2.5.2.26539-0/builds/posix/prefix.linux_generic =================================================================== --- Firebird-2.5.2.26539-0.orig/builds/posix/prefix.linux_generic +++ Firebird-2.5.2.26539-0/builds/posix/prefix.linux_generic @@ -18,7 +18,7 @@ # # 2 Oct 2002, Nickolay Samofatov - Major cleanup -COMMON_FLAGS=-DLINUX -pipe -MMD -fPIC -DFB_SEND_FLAGS=MSG_NOSIGNAL +COMMON_FLAGS=-DLINUX -pipe -MMD -fPIC -DFB_SEND_FLAGS=MSG_NOSIGNAL -fsigned-char PROD_FLAGS=-ggdb -O3 -DNDEBUG $(COMMON_FLAGS) DEV_FLAGS=-ggdb -p -Wall -Wno-switch $(COMMON_FLAGS) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
