[netbeans-platform] Symlink to JNA *.so instead of shipping duplicates. Build native bits with $RPM_OPT_FLAGS and withou
Ville Skyttä
scop at fedoraproject.org
Tue Sep 20 19:15:01 UTC 2011
commit 7b688cef5a562f33bcd82e88d3494b0a9d3d2ce8
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Mon Jul 4 18:29:41 2011 +0300
Symlink to JNA *.so instead of shipping duplicates. Build native bits with $RPM_OPT_FLAGS and without stripping. Disable empty -debuginfo subpackage.
jnilib-build-uniformly-across-archs.patch | 34 ++++++++++++++++++----------
netbeans-platform.spec | 13 ++++++++++-
2 files changed, 34 insertions(+), 13 deletions(-)
---
diff --git a/jnilib-build-uniformly-across-archs.patch b/jnilib-build-uniformly-across-archs.patch
index 4bf4ac1..2e819a7 100644
--- a/jnilib-build-uniformly-across-archs.patch
+++ b/jnilib-build-uniformly-across-archs.patch
@@ -1,17 +1,22 @@
diff -ruN netbeans-platform.orig/nbi/engine/native/jnilib/linux/nbproject/Makefile-Debug_amd64.mk netbeans-platform/nbi/engine/native/jnilib/linux/nbproject/Makefile-Debug_amd64.mk
--- netbeans-platform.orig/nbi/engine/native/jnilib/linux/nbproject/Makefile-Debug_amd64.mk 2011-06-03 12:06:03.993675429 -0400
+++ netbeans-platform/nbi/engine/native/jnilib/linux/nbproject/Makefile-Debug_amd64.mk 2011-06-03 18:54:48.073675374 -0400
-@@ -80,11 +80,11 @@
+@@ -76,15 +76,15 @@ LDLIBSOPTIONS=
+
+ dist/linux-amd64.so: ${OBJECTFILES}
+ ${MKDIR} -p dist
+- ${LINK.c} -shared -o dist/linux-amd64.so -s ${OBJECTFILES} ${LDLIBSOPTIONS}
++ ${LINK.c} -shared -o dist/linux-amd64.so ${OBJECTFILES} ${LDLIBSOPTIONS}
${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src/CommonUtils.o: ../.common/src/CommonUtils.c
${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src
- $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/linux -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src/CommonUtils.o ../.common/src/CommonUtils.c
-+ $(COMPILE.c) -s -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src/CommonUtils.o ../.common/src/CommonUtils.c
++ $(COMPILE.c) -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src/CommonUtils.o ../.common/src/CommonUtils.c
${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o: ../.unix/src/jni_UnixNativeUtils.c
${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src
- $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/linux -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o ../.unix/src/jni_UnixNativeUtils.c
-+ $(COMPILE.c) -s -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o ../.unix/src/jni_UnixNativeUtils.c
++ $(COMPILE.c) -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o ../.unix/src/jni_UnixNativeUtils.c
# Subprojects
.build-subprojects:
@@ -23,27 +28,32 @@ diff -ruN netbeans-platform.orig/nbi/engine/native/jnilib/linux/nbproject/Makefi
# C Compiler Flags
-CFLAGS=-shared -m32 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-+CFLAGS=-shared -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
++CFLAGS=$(RPM_OPT_FLAGS) -shared -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
# CC Compiler Flags
-CCFLAGS=-shared -m32 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-CXXFLAGS=-shared -m32 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-+CCFLAGS=-shared -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-+CXXFLAGS=-shared -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
++CCFLAGS=$(RPM_OPT_FLAGS) -shared -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
++CXXFLAGS=$(RPM_OPT_FLAGS) -shared -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
# Fortran Compiler Flags
FFLAGS=
-@@ -50,11 +50,11 @@
+@@ -46,15 +46,15 @@ LDLIBSOPTIONS=
+
+ dist/linux.so: ${OBJECTFILES}
+ ${MKDIR} -p dist
+- ${LINK.c} -shared -o dist/linux.so -s ${OBJECTFILES} ${LDLIBSOPTIONS}
++ ${LINK.c} -shared -o dist/linux.so ${OBJECTFILES} ${LDLIBSOPTIONS}
${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src/CommonUtils.o: ../.common/src/CommonUtils.c
${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src
- $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/linux -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src/CommonUtils.o ../.common/src/CommonUtils.c
-+ $(COMPILE.c) -s -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src/CommonUtils.o ../.common/src/CommonUtils.c
++ $(COMPILE.c) -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.common/src/CommonUtils.o ../.common/src/CommonUtils.c
${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o: ../.unix/src/jni_UnixNativeUtils.c
${MKDIR} -p ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src
- $(COMPILE.c) -s -I/usr/java/include -I/usr/java/include/linux -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o ../.unix/src/jni_UnixNativeUtils.c
-+ $(COMPILE.c) -s -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o ../.unix/src/jni_UnixNativeUtils.c
++ $(COMPILE.c) -I/usr/lib/jvm/java/include -I/usr/lib/jvm/java/include/linux -o ${OBJECTDIR}/_ext/home/dl198383/tmp/nbi/engine/native/jnilib/linux/../.unix/src/jni_UnixNativeUtils.o ../.unix/src/jni_UnixNativeUtils.c
# Subprojects
.build-subprojects:
@@ -55,13 +65,13 @@ diff -ruN netbeans-platform.orig/nbi/engine/native/jnilib/linux/nbproject/Makefi
# C Compiler Flags
-CFLAGS=
-+CFLAGS=-fPIC
++CFLAGS=$(RPM_OPT_FLAGS) -fPIC
# CC Compiler Flags
-CCFLAGS=
-CXXFLAGS=
-+CCFLAGS=-fPIC
-+CXXFLAGS=-fPIC
++CCFLAGS=$(RPM_OPT_FLAGS) -fPIC
++CXXFLAGS=$(RPM_OPT_FLAGS) -fPIC
# Fortran Compiler Flags
FFLAGS=
diff --git a/netbeans-platform.spec b/netbeans-platform.spec
index 10f4272..751d78f 100644
--- a/netbeans-platform.spec
+++ b/netbeans-platform.spec
@@ -58,9 +58,11 @@
%global rmFiles() find . -type f \\( -iname %{1} \\) | \
tee -a ./rmFiles.lst | xargs -t %__rm -f ;
+%global debug_package %{nil}
+
Name: netbeans-platform
Version: %{nb_ver}
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NetBeans Platform %{nb_platform_ver}
Group: Development/Libraries
License: GPLv2 with exceptions or CDDL
@@ -255,6 +257,10 @@ pushd %{buildroot}%{nb_platform_dir}/modules/ext
%lnSys %{_javadir}/felix/org.osgi.core.jar osgi.core-4.2.jar
%lnSys %{_javadir}/swing-layout.jar swing-layout-1.0.4.jar
popd
+pushd %{buildroot}%{nb_platform_dir}/modules/lib
+ %lnSys %{_libdir}/jna/libjnidispatch.so amd64/Linux/libjnidispatch.so
+ %lnSys %{_libdir}/jna/libjnidispatch.so i386/Linux/libjnidispatch.so
+popd
# install harness
%__mkdir_p %{buildroot}%{nb_harness_dir}
@@ -326,6 +332,11 @@ popd
%doc nbbuild/licenses/CDDL-GPL-2-CP
%changelog
+* Sun Jul 3 2011 Ville Skyttä <ville.skytta at iki.fi> - 7.0-3
+- Symlink to JNA *.so instead of shipping duplicates.
+- Build native bits with $RPM_OPT_FLAGS and without stripping.
+- Disable empty -debuginfo subpackage.
+
* Mon Jun 6 2011 Omair Majid <omajid at redhat.com> - 7.0-2
- Remove version numbers from descriptions and summaries.
More information about the scm-commits
mailing list