Changeset c1da7f7 for debian/patches/0002-jbigi-soname.patch

Timestamp:

May 12, 2013 12:08:52 AM (8 years ago)

Author:

kytv <kytv@…>

Branches:

master

Children:

b096834

Parents:

dca5e98

Message:

improvements to jbigi scripts

support for Solaris (tested with Solaris 11 x86)

mbuild-all.sh:

• output correctly formatted file names (tested in Solaris x86, FreeBSD (x86 and x64) and Linux (x86 & x64))
• switch from echo -e to the more portable printf
• more error checking, comments

debian/patches: refreshed based on changes to core/c/*
libjcpuid-x86_64-solaris.so: built in solaris 11 x86 with

java 1.7.0_07 and gcc 4.5.2, stripped

File:

• debian/patches/0002-jbigi-soname.patch (modified) (2 diffs)

debian/patches/0002-jbigi-soname.patch

@@ -10 +10 @@
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/core/c/jbigi/build_jbigi.sh b/core/c/jbigi/build_jbigi.sh
-index b1a68dd..99b31e4 100755
 --- a/core/c/jbigi/build_jbigi.sh
 +++ b/core/c/jbigi/build_jbigi.sh
-@@ -39,7 +39,7 @@ SunOS*|OpenBSD*|NetBSD*|*FreeBSD*|Linux*)
+@@ -39,7 +39,7 @@
              UNIXTYPE="linux"
          fi
-         COMPILEFLAGS="-fPIC -Wall"
+         COMPILEFLAGS="-fPIC -Wall $CFLAGS"
 -        INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/${UNIXTYPE}"
 +        INCLUDES="-I. -I./jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/${UNIXTYPE}"
@@ -23 +21 @@
          LIBFILE="libjbigi.so";;
  *)
-@@ -58,7 +58,7 @@ fi
+@@ -58,7 +58,7 @@
  
  echo "Compiling C code..."