Changeset 597fc55 for debian


Ignore:
Timestamp:
Sep 21, 2011 1:37:44 PM (9 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
a45c333
Parents:
3df7ef0
Message:

rebase patch due to (my) recent changes in core/c/jbigi/mbuild_jbigi.sh

File:
1 edited

Legend:

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

    r3df7ef0 r597fc55  
    44
    55The purpose of this patch is to change the path that mbuild_jbigi.sh
    6 expects to find the source files at. At the same time I'm specifying 
     6expects to find the source files at. At the same time I'm specifying
    77a soname to shut lintian up.
    88
     
    1313--- a/core/c/jbigi/mbuild_jbigi.sh
    1414+++ b/core/c/jbigi/mbuild_jbigi.sh
    15 @@ -25,14 +25,14 @@
    16          LIBFILE="libjbigi.jnilib";;
    17  SunOS*)
     15@@ -47,7 +47,7 @@
     16                fi
     17         fi
    1818         COMPILEFLAGS="-fPIC -Wall"
    19 -        INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/solaris"
    20 -        LINKFLAGS="-shared -Wl,-soname,libjbigi.so"
    21 +        INCLUDES="-I. -I./jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/solaris"
    22 +        LINKFLAGS="-shared -Wl,-soname,libjbigi.so.0"
     19-        INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/${UNIXTYPE}"
     20+        INCLUDES="-I. -I./jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/${UNIXTYPE}"
     21         LINKFLAGS="-shared -Wl,-soname,libjbigi.so"
    2322         LIBFILE="libjbigi.so";;
    24  
    2523 *)
    26         COMPILEFLAGS="-fPIC -Wall"
    27 -       INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
    28 -       LINKFLAGS="-shared -Wl,-soname,libjbigi.so"
    29 +       INCLUDES="-I. -I./jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/linux"
    30 +       LINKFLAGS="-shared -Wl,-soname,libjbigi.so.0"
    31         LIBFILE="libjbigi.so";;
    32  esac
    33  
    34 @@ -47,7 +47,7 @@
     24@@ -66,7 +66,7 @@
    3525 
    3626 echo "Compiling C code..."
Note: See TracChangeset for help on using the changeset viewer.