The package rpms/fastbit.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/fastbit.git/commit/?id=e34447f41b....
Change:
-ExcludeArch: s390x
Thanks.
Full change:
============
commit e34447f41b08f19f71b6983bc52da011f1050a2b
Author: Philip Kovacs <pkfed(a)fedoraproject.org>
Date: Tue May 18 19:46:39 2021 -0400
Remove java bindings due to orphaned dependencies
diff --git a/fastbit.spec b/fastbit.spec
index 4f6b2dd..a1b212a 100644
--- a/fastbit.spec
+++ b/fastbit.spec
@@ -1,6 +1,6 @@
Name: fastbit
Version: 2.0.3
-Release: 20%{?dist}
+Release: 21%{?dist}
Summary: An Efficient Compressed Bitmap Index Technology
License: BSD
URL:
https://sdm.lbl.gov/fastbit/
@@ -24,23 +24,13 @@ Patch10: fastbit_pthread_linkage.patch
# Build system patch for tests to use compiled binaries, not libtool wrappers
Patch11: fastbit_tests_use_binaries.patch
-# Build system patch to avoid versioning the JNI shared library (plugin)
-Patch12: fastbit_jni_avoid_version.patch
-
-# Fedora patch for java bindings to use System.load not System.loadLibrary
-Patch20: fastbit_java_system_load.patch
-
Patch30: %{name}-gcc11.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
-BuildRequires: java-devel
-BuildRequires: javapackages-tools
+BuildRequires: make
BuildRequires: perl-interpreter
-BuildRequires: make
-
-ExcludeArch: s390x
%description
FastBit is an open-source data processing library following the spirit of NoSQL
@@ -57,20 +47,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
Development package for FastBit. Includes headers, libraries and man pages for
using FastBit API.
-%package java
-Summary: FastBit Java libraries
-Requires: %{name}%{?_isa} = %{version}-%{release}
-%description java
-FastBit API bindings for java using JNI.
-
%prep
%autosetup -p1 -n %{name}-%{version}
-# remove bundled jars before build as required
-rm -f java/tests/lib/commons-logging.jar
-rm -f java/tests/lib/log4j-1.2.15.jar
-rm -f java/tests/lib/junit-4.4.jar
-
echo fixing permissions ...
find . -type f -perm /0111 \
\( -name \*.cpp -or -name \*.h -or -name \*.yy -or -name \*.ll -or \
@@ -83,8 +62,7 @@ automake --copy --no-force
%configure \
--disable-static \
--enable-contrib \
- --with-quiet-nan \
- --with-java=%{java_home}
+ --with-quiet-nan
# patch libtool to remove rpaths
sed -i 's|^hardcode_into_libs=.*|hardcode_into_libs=no|g' libtool
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g'
libtool
@@ -99,15 +77,6 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g'
libtool
%install
%make_install
-# move jar file to _jnidir, as required
-install -d -m 0755 %{buildroot}%{_jnidir}
-mv %{buildroot}%{_libdir}/fastbitjni.jar %{buildroot}%{_jnidir}/%{name}.jar
-chmod 0644 %{buildroot}%{_jnidir}/%{name}.jar
-
-# move JNI shared library to _libdir/name, as required
-install -d -m 0755 %{buildroot}%{_libdir}/%{name}
-mv %{buildroot}%{_libdir}/libfastbitjni.so %{buildroot}%{_libdir}/%{name}/
-
# remove libtool archives
find %{buildroot} -name \*.la | xargs rm -f
@@ -133,12 +102,10 @@ find %{buildroot} -name \*.la | xargs rm -f
%{_bindir}/fastbit-config
%{_libdir}/libfastbit.so
-%files java
-%dir %{_libdir}/%{name}
-%{_libdir}/%{name}/libfastbitjni.so
-%{_jnidir}/%{name}.jar
-
%changelog
+* Tue May 18 2021 Philip Kovacs <pkfed(a)fedoraproject.org> - 2.0.3-21
+- Remove java bindings due to orphaned dependencies
+
* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.3-20
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
diff --git a/fastbit_java_system_load.patch b/fastbit_java_system_load.patch
deleted file mode 100644
index 371a725..0000000
--- a/fastbit_java_system_load.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/java/gov/lbl/fastbit/FastBit.java 2017-09-19 16:01:19.996924503 -0400
-+++ b/java/gov/lbl/fastbit/FastBit.java 2017-09-19 16:26:50.422027222 -0400
-@@ -184,8 +184,52 @@
- */
- protected void finalize() {cleanup();}
-
-- static { // load the native FastBit library.
-- System.loadLibrary("fastbitjni");
-+
-+ // Helper to load shared library.
-+ static boolean tryLoad(String filename) {
-+ try {
-+ System.load(filename);
-+ } catch (Exception e) {
-+ return false;
-+ } catch (UnsatisfiedLinkError e) {
-+ return false;
-+ }
-+ return true;
-+ }
-+
-+ // Load the native FastBit library.
-+ static {
-+ boolean mNativeLibrariesLoaded = false;
-+ String os = System.getProperty("os.name");
-+ if ((os.equals("Linux"))) {
-+ // Check for 64-bit library availability
-+ // prior to 32-bit library availability.
-+ mNativeLibrariesLoaded =
-+ tryLoad("/usr/lib64/fastbit/libfastbitjni.so");
-+ if (mNativeLibrariesLoaded) {
-+ System.out.println("64-bit fastbit library loaded");
-+ } else {
-+ // REMINDER: May be trying to run a 32-bit app
-+ // on 64-bit platform.
-+ mNativeLibrariesLoaded =
-+ tryLoad("/usr/lib/fastbit/libfastbitjni.so");
-+ if (mNativeLibrariesLoaded) {
-+ System.out.println("32-bit fastbit library loaded");
-+ } else {
-+ System.out.println("FAILED loading fastbit library");
-+ System.exit(-1);
-+ }
-+ }
-+ } else {
-+ try {
-+ System.loadLibrary("fastbitjni");
-+ System.out.println("fastbit library loaded");
-+ mNativeLibrariesLoaded = true;
-+ } catch (Throwable t) {
-+ // This is bad news, the program is doomed at this point
-+ t.printStackTrace();
-+ }
-+ }
- }
- } // class FastBit
- /// @}
diff --git a/fastbit_jni_avoid_version.patch b/fastbit_jni_avoid_version.patch
deleted file mode 100644
index 2d81812..0000000
--- a/fastbit_jni_avoid_version.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/java/Makefile.am 2017-09-26 18:16:56.087401096 -0400
-+++ b/java/Makefile.am 2017-09-26 18:17:10.669799169 -0400
-@@ -18,6 +18,7 @@
- pkginclude_HEADERS = FastBit.h ../src/capi.h
- libfastbitjni_la_DEPENDENCIES = ../src/libfastbit.la build.properties
- libfastbitjni_la_LIBADD = ../src/libfastbit.la
-+libfastbitjni_la_LDFLAGS = -avoid-version
- #
- install-exec-local: fastbitjni.jar
- $(INSTALL) fastbitjni.jar "$(DESTDIR)$(libdir)"
commit 44e112012bc633078e5f38788db7a36746e18d28
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Tue Jan 26 05:13:07 2021 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/fastbit.spec b/fastbit.spec
index c4cf0ad..4f6b2dd 100644
--- a/fastbit.spec
+++ b/fastbit.spec
@@ -1,6 +1,6 @@
Name: fastbit
Version: 2.0.3
-Release: 19%{?dist}
+Release: 20%{?dist}
Summary: An Efficient Compressed Bitmap Index Technology
License: BSD
URL:
https://sdm.lbl.gov/fastbit/
@@ -139,6 +139,9 @@ find %{buildroot} -name \*.la | xargs rm -f
%{_jnidir}/%{name}.jar
%changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.3-20
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
* Wed Dec 09 2020 Jeff Law <law(a)redhat.com> - 2.0.3-19
- Fix ordered pointer comparisons against zero for gcc-11
commit 20ded17ba1a6e8048a8a3e1723e37d016a395911
Author: Tom Stellard <tstellar(a)redhat.com>
Date: Fri Dec 18 22:30:04 2020 +0000
Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
diff --git a/fastbit.spec b/fastbit.spec
index e2ed6db..c4cf0ad 100644
--- a/fastbit.spec
+++ b/fastbit.spec
@@ -38,6 +38,7 @@ BuildRequires: gcc-c++
BuildRequires: java-devel
BuildRequires: javapackages-tools
BuildRequires: perl-interpreter
+BuildRequires: make
ExcludeArch: s390x
commit 392728a6a4648215e39d617ce2092c9d4c883b4d
Author: Jeff Law <law(a)redhat.com>
Date: Wed Dec 9 15:22:21 2020 -0700
Fix ordered pointer comparisons against zero for gcc-11
diff --git a/fastbit-gcc11.patch b/fastbit-gcc11.patch
new file mode 100644
index 0000000..941f48e
--- /dev/null
+++ b/fastbit-gcc11.patch
@@ -0,0 +1,26 @@
+diff --git a/src/array_t.cpp b/src/array_t.cpp
+index 8ef321e..e54c451 100644
+--- a/src/array_t.cpp
++++ b/src/array_t.cpp
+@@ -1694,7 +1694,7 @@ ibis::array_t<T>::insert(typename
ibis::array_t<T>::iterator p,
+ }
+ }
+ else { // need new memory, copy-and-swap
+- const difference_type nold = (m_begin > 0 && m_end > m_begin ?
++ const difference_type nold = (m_begin != 0 && m_end > m_begin ?
+ m_end - m_begin : 0);
+ size_t nnew = static_cast<size_t>(nold + (nold>=n ? nold : n));
+ if (nnew > 0x7FFFFFFFU) {
+diff --git a/src/array_t.h b/src/array_t.h
+index 6c0bd57..d0c4d49 100644
+--- a/src/array_t.h
++++ b/src/array_t.h
+@@ -67,7 +67,7 @@ public:
+
+ bool empty() const {return (m_begin == 0 || m_begin >= m_end);};
+ size_t size() const { ///!< Return the number of elements.
+- return (m_begin > 0 && m_end > m_begin ? m_end - m_begin : 0);
++ return (m_begin != 0 && m_end > m_begin ? m_end - m_begin : 0);
+ };
+ inline void clear();
+
diff --git a/fastbit.spec b/fastbit.spec
index ea39bcc..e2ed6db 100644
--- a/fastbit.spec
+++ b/fastbit.spec
@@ -1,6 +1,6 @@
Name: fastbit
Version: 2.0.3
-Release: 18%{?dist}
+Release: 19%{?dist}
Summary: An Efficient Compressed Bitmap Index Technology
License: BSD
URL:
https://sdm.lbl.gov/fastbit/
@@ -30,6 +30,8 @@ Patch12: fastbit_jni_avoid_version.patch
# Fedora patch for java bindings to use System.load not System.loadLibrary
Patch20: fastbit_java_system_load.patch
+Patch30: %{name}-gcc11.patch
+
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
@@ -136,6 +138,9 @@ find %{buildroot} -name \*.la | xargs rm -f
%{_jnidir}/%{name}.jar
%changelog
+* Wed Dec 09 2020 Jeff Law <law(a)redhat.com> - 2.0.3-19
+- Fix ordered pointer comparisons against zero for gcc-11
+
* Mon Jul 27 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.3-18
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild