[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_4.0.4-2-2-g656c3e5
The following commit has been merged in the master branch:
commit 656c3e513666a6202812a9a63d371dac7eba6160
Author: Rene Engelhard <rene@rene-engelhard.de>
Date: Wed Jun 19 21:30:08 2013 +0200
better fix for gcj-safe-jni-h-include.diffs -I
diff --git a/changelog b/changelog
index 0261758..7880f7e 100644
--- a/changelog
+++ b/changelog
@@ -2,7 +2,7 @@ libreoffice (1:4.0.4-2) unstable; urgency=low
* brown paper bag release
- * debian/patches/gcj-safe-jni-h-include.diff: remove bogus -I...
+ * debian/patches/gcj-safe-jni-h-include.diff: fix -I placement...
* debian/rules:
- fix JAVA_MAINVER setting to actually set 6 for mips(el) and not
diff --git a/patches/gcj-safe-jni-h-include.diff b/patches/gcj-safe-jni-h-include.diff
index 5524dc3..e0d0c81 100644
--- a/patches/gcj-safe-jni-h-include.diff
+++ b/patches/gcj-safe-jni-h-include.diff
@@ -5,7 +5,7 @@
save_CFLAGS=$CFLAGS
save_LDFLAGS=$LDFLAGS
- CFLAGS="$CFLAGS -I$JAVA_HOME/include"
-+ GCJ_JNI_INCLUDE=`$JAVA_HOME/bin/gcj --print-file-name include/jni.h | $SED -e s,\/jni.h,,g`
++ GCJ_JNI_INCLUDE=-I`$JAVA_HOME/bin/gcj --print-file-name include/jni.h | $SED -e s,\/jni.h,,g`
+ CFLAGS="$CFLAGS -I$JAVA_HOME/include $GCJ_JNI_INCLUDE"
LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj"
exec 6>/dev/null # no output
--
LibreOffice packaging repository
Reply to: