Changeset c1da7f7 for debian


Ignore:
Timestamp:
May 12, 2013 12:08:52 AM (7 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

Location:
debian/patches
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • debian/patches/0002-jbigi-soname.patch

    rdca5e98 rc1da7f7  
    1010 1 file changed, 2 insertions(+), 2 deletions(-)
    1111
    12 diff --git a/core/c/jbigi/build_jbigi.sh b/core/c/jbigi/build_jbigi.sh
    13 index b1a68dd..99b31e4 100755
    1412--- a/core/c/jbigi/build_jbigi.sh
    1513+++ b/core/c/jbigi/build_jbigi.sh
    16 @@ -39,7 +39,7 @@ SunOS*|OpenBSD*|NetBSD*|*FreeBSD*|Linux*)
     14@@ -39,7 +39,7 @@
    1715             UNIXTYPE="linux"
    1816         fi
    19          COMPILEFLAGS="-fPIC -Wall"
     17         COMPILEFLAGS="-fPIC -Wall $CFLAGS"
    2018-        INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/${UNIXTYPE}"
    2119+        INCLUDES="-I. -I./jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/${UNIXTYPE}"
     
    2321         LIBFILE="libjbigi.so";;
    2422 *)
    25 @@ -58,7 +58,7 @@ fi
     23@@ -58,7 +58,7 @@
    2624 
    2725 echo "Compiling C code..."
  • debian/patches/0003-renaming-jcpuid.patch

    rdca5e98 rc1da7f7  
    77 1 file changed, 2 insertions(+), 6 deletions(-)
    88
    9 diff --git a/core/c/jcpuid/build.sh b/core/c/jcpuid/build.sh
    10 index f3fc9c2..cbd0934 100755
    119--- a/core/c/jcpuid/build.sh
    1210+++ b/core/c/jcpuid/build.sh
    13 @@ -67,12 +67,8 @@ case `uname -s` in
     11@@ -74,12 +74,8 @@
    1412                 exit 0;;
    1513         esac
Note: See TracChangeset for help on using the changeset viewer.