[jffi] update to jffi version 1.0.2
Mohammed Morsi
mmorsi at fedoraproject.org
Tue Oct 26 16:43:49 UTC 2010
commit 794260cc386dd6bc7ed7f6b012806be19d85fea5
Author: Mohammed Morsi <mmorsi at redhat.com>
Date: Tue Oct 26 12:44:06 2010 -0400
update to jffi version 1.0.2
.gitignore | 1 +
fix_compilation_flags.patch | 29 ++++++++++++--------------
fix_dependencies_in_build_xml.patch | 38 ++++++++++++++--------------------
fix_jar_dependencies.patch | 4 +-
jffi.spec | 11 ++++++---
sources | 2 +-
6 files changed, 40 insertions(+), 45 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1a54ee5..4d1992d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
wmeissner-jffi-bbb81f1.tar.gz
+/wmeissner-jffi-e0d10e9.tar.gz
diff --git a/fix_compilation_flags.patch b/fix_compilation_flags.patch
index 62d6053..4e8db2f 100644
--- a/fix_compilation_flags.patch
+++ b/fix_compilation_flags.patch
@@ -1,33 +1,30 @@
---- jni/GNUmakefile.orig 2010-02-23 12:42:51.564630229 -0500
-+++ jni/GNUmakefile 2010-02-23 15:15:40.773647826 -0500
-@@ -62,25 +62,27 @@
- JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing -DNDEBUG
- OFLAGS = -O2 $(JFLAGS)
+--- jni/GNUmakefile.orig 2010-10-25 11:17:51.000000000 -0400
++++ jni/GNUmakefile 2010-10-25 16:15:38.000000000 -0400
+@@ -65,9 +65,9 @@ OFLAGS = -O2 $(JFLAGS)
# MacOS headers aren't completely warning free, so turn them off
ifneq ($(OS),darwin)
-- WFLAGS = -W -Werror -Wall -Wno-unused -Wno-parentheses -Wundef
-+ WFLAGS = -W -Wall -Wno-parentheses -Wundef
+- WFLAGS += -Wundef -Werror
++ WFLAGS += -Wundef
endif
+-WFLAGS += -W -Wall -Wno-unused -Wno-parentheses
++WFLAGS += -W -Wall -Wno-parentheses
PICFLAGS = -fPIC
SOFLAGS = # Filled in for each OS specifically
FFI_MMAP_EXEC = -DFFI_MMAP_EXEC_WRIT
-
- FFI_CC=$(CCACHE) $(CC)
- FFI_LD=$(LD)
+@@ -75,11 +75,13 @@ FFI_MMAP_EXEC = -DFFI_MMAP_EXEC_WRIT
+ FFI_CC = $(CCACHE) $(CC)
+ FFI_LD = $(LD)
FFI_CFLAGS = $(FFI_MMAP_EXEC) $(OFLAGS)
--STRIP = strip -S
+-STRIP ?= strip -S
+STRIP = /bin/true
++
++RPMFLAGS=$(shell rpm --eval %optflags)
JDK_INCLUDES = -I"$(JDK_HOME)/include" -I"$(JDK_HOME)/include/$(OS)"
-
-+RPMFLAGS=$(shell rpm --eval %optflags)
-+
IFLAGS = -I"$(BUILD_DIR)" -I"$(BUILD_DIR)"/jni -I$(SRC_DIR) -I"$(JFFI_SRC_DIR)"
-CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) $(LIBFFI_CFLAGS)
+CFLAGS = $(OFLAGS) $(WFLAGS) $(IFLAGS) $(PICFLAGS) $(JDK_INCLUDES) $(LIBFFI_CFLAGS) $(RPMFLAGS)
CFLAGS += -D_REENTRANT -D_LARGEFILE64_SOURCE -D_GNU_SOURCE
ifeq ($(OS), win64)
- override CPU = x86_64
- JDK_INCLUDES=-I$(JNI_DIR)/win32/include -I$(JNI_DIR)/win32/include/win32
diff --git a/fix_dependencies_in_build_xml.patch b/fix_dependencies_in_build_xml.patch
index f742f14..cbf455a 100644
--- a/fix_dependencies_in_build_xml.patch
+++ b/fix_dependencies_in_build_xml.patch
@@ -1,8 +1,6 @@
---- custom-build.xml.orig 2010-02-17 19:14:51.888382184 -0500
-+++ custom-build.xml 2010-02-17 19:15:49.675385072 -0500
-@@ -120,12 +120,11 @@
- <arg value="SRC_DIR=${jni.src.dir}"/>
- <arg value="JNI_DIR=${jni.src.dir}"/>
+--- custom-build.xml.orig 2010-10-25 11:15:20.000000000 -0400
++++ custom-build.xml 2010-10-25 11:16:03.000000000 -0400
+@@ -129,8 +129,7 @@
<arg value="BUILD_DIR=${jni.build.dir}"/>
<arg value="CPU=${platform.cpu}"/>
<arg value="VERSION=${jffi.version.major}.${jffi.version.minor}"/>
@@ -12,26 +10,22 @@
<arg value="-f"/>
<arg value="${jni.GNUmakefile}"/>
</exec>
-
- </target>
-@@ -190,20 +189,10 @@
- </target>
+@@ -198,18 +197,7 @@
<target name="-assemble-native-jar" depends="-init-vars, -build-platform-jar">
<jar jarfile="${native.jar}" index="true" update="true" duplicate="preserve"
filesetmanifest="skip">
- <zipfileset src="${dist.dir}/${platform}.jar"/>
-- <zipfileset src="archive/Darwin.jar"/>
-- <zipfileset src="archive/i386-Windows.jar"/>
-- <zipfileset src="archive/i386-Linux.jar"/>
-- <zipfileset src="archive/i386-SunOS.jar"/>
-- <zipfileset src="archive/x86_64-Linux.jar"/>
-- <zipfileset src="archive/x86_64-SunOS.jar"/>
-- <zipfileset src="archive/s390x-Linux.jar"/>
-- <zipfileset src="archive/sparc-SunOS.jar"/>
-- <zipfileset src="archive/sparcv9-SunOS.jar"/>
-- <zipfileset src="archive/ppc-AIX.jar"/>
+- <zipfileset src="archive/jffi-Darwin.jar"/>
+ <zipfileset src="${dist.dir}/jffi-${platform}.jar"/>
+- <zipfileset src="archive/jffi-i386-Windows.jar"/>
+- <zipfileset src="archive/jffi-i386-Linux.jar"/>
+- <zipfileset src="archive/jffi-i386-SunOS.jar"/>
+- <zipfileset src="archive/jffi-x86_64-SunOS.jar"/>
+- <zipfileset src="archive/jffi-x86_64-Linux.jar"/>
+- <zipfileset src="archive/jffi-s390x-Linux.jar"/>
+- <zipfileset src="archive/jffi-sparc-SunOS.jar"/>
+- <zipfileset src="archive/jffi-sparcv9-SunOS.jar"/>
+- <zipfileset src="archive/jffi-ppc-AIX.jar"/>
+- <zipfileset src="archive/jffi-ppc-Linux.jar"/>
</jar>
</target>
<target name="-archive-platform-jar" depends="-build-platform-jar">
- <copy file="${dist.dir}/${platform}.jar" todir="archive" flatten="true"/>
- </target>
diff --git a/fix_jar_dependencies.patch b/fix_jar_dependencies.patch
index 892a823..75a0d46 100644
--- a/fix_jar_dependencies.patch
+++ b/fix_jar_dependencies.patch
@@ -1,5 +1,5 @@
---- lib/nblibraries.properties.orig 2010-02-23 13:49:59.863628941 -0500
-+++ lib/nblibraries.properties 2010-02-23 13:50:56.443652922 -0500
+--- lib/nblibraries.properties.orig 2010-10-25 11:16:48.000000000 -0400
++++ lib/nblibraries.properties 2010-10-25 11:17:11.000000000 -0400
@@ -1,12 +1,10 @@
libs.junit.classpath=\
- ${base}/junit/junit-3.8.2.jar
diff --git a/jffi.spec b/jffi.spec
index a59d5a1..d7f2e91 100644
--- a/jffi.spec
+++ b/jffi.spec
@@ -1,9 +1,9 @@
-%global git_commit bbb81f1
+%global git_commit e0d10e9
%global cluster wmeissner
Name: jffi
-Version: 0.6.5
-Release: 4%{?dist}
+Version: 1.0.2
+Release: 1%{?dist}
Summary: An optimized Java interface to libffi
Group: System Environment/Libraries
@@ -70,7 +70,7 @@ rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_jnidir}
-cp build/jni/libjffi-0.6.so $RPM_BUILD_ROOT%{_libdir}/%{name}/
+cp build/jni/libjffi-1.0.so $RPM_BUILD_ROOT%{_libdir}/%{name}/
cp dist/jffi-complete.jar $RPM_BUILD_ROOT%{_libdir}/%{name}/%{name}-%{version}.jar
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_libdir}/%{name}/%{name}.jar
ln -s %{_libdir}/%{name}/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_jnidir}/%{name}.jar
@@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
%{_javadocdir}/jffi
%changelog
+* Mon Oct 25 2010 <mmorsi at redhat.com> - 1.0.2-1
+- Updated to most recent upstream release
+
* Wed Apr 14 2010 <mmorsi at redhat.com> - 0.6.5-4
- added Mamoru Tasaka's fix for ppc{,64} to prep
diff --git a/sources b/sources
index 4fa5505..04a4b63 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a12937715146b2374f0e209c7468f5df wmeissner-jffi-bbb81f1.tar.gz
+98ec919980a179d0de797c94993541a2 wmeissner-jffi-e0d10e9.tar.gz
More information about the scm-commits
mailing list