Changeset c2e486f for debian


Ignore:
Timestamp:
Apr 29, 2016 3:30:55 PM (4 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
5067b000
Parents:
fbeca5e
Message:

Debian: Refresh patches after jbigi/jcpuid build script changes

Location:
debian/patches
Files:
2 edited

Legend:

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

    rfbeca5e rc2e486f  
    1414--- a/core/c/jbigi/build_jbigi.sh
    1515+++ b/core/c/jbigi/build_jbigi.sh
    16 @@ -39,7 +39,7 @@ SunOS*|OpenBSD*|NetBSD*|*FreeBSD*|Linux*)
    17              UNIXTYPE="linux"
     16@@ -43,7 +43,7 @@
     17             BUILD_OS="linux"
    1818         fi
    1919         COMPILEFLAGS="-fPIC -Wall $CFLAGS"
    20 -        INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/${UNIXTYPE} -I/usr/local/include"
    21 +        INCLUDES="-I. -I./jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/${UNIXTYPE} -I/usr/local/include"
     20-        INCLUDES="-I. -I../../jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/$BUILD_OS -I/usr/local/include"
     21+        INCLUDES="-I. -I./jbigi/include -I$JAVA_HOME/include -I$JAVA_HOME/include/$BUILD_OS -I/usr/local/include"
    2222         LINKFLAGS="-shared -Wl,-soname,libjbigi.so"
    2323         LIBFILE="libjbigi.so";;
    2424 *)
    25 @@ -58,7 +58,7 @@ fi
     25@@ -64,8 +64,8 @@
     26 [ $BITS -eq 64 ] && COMPILEFLAGS="-m64 $COMPILEFLAGS" && LINKFLAGS="-m64 $LINKFLAGS"
    2627 
    2728 echo "Compiling C code..."
    28  rm -f jbigi.o $LIBFILE
     29-echo "Compile: \"$CC -c $COMPILEFLAGS $INCLUDES ../../jbigi/src/jbigi.c\""
    2930-$CC -c $COMPILEFLAGS $INCLUDES ../../jbigi/src/jbigi.c || exit 1
     31+echo "Compile: \"$CC -c $COMPILEFLAGS $INCLUDES ./jbigi/src/jbigi.c\""
    3032+$CC -c $COMPILEFLAGS $INCLUDES ./jbigi/src/jbigi.c || exit 1
     33 echo "Link: \"$CC $LINKFLAGS $INCLUDES -o $LIBFILE jbigi.o $INCLUDELIBS $STATICLIBS $LIBPATH\""
    3134 $CC $LINKFLAGS $INCLUDES -o $LIBFILE jbigi.o $INCLUDELIBS $STATICLIBS $LIBPATH || exit 1
    3235 
    33  exit 0
  • debian/patches/0003-rename-jcpuid.patch

    rfbeca5e rc2e486f  
    1111--- a/core/c/jcpuid/build.sh
    1212+++ b/core/c/jcpuid/build.sh
    13 @@ -75,12 +75,8 @@ case `uname -s` in
    14                  exit 0;;
    15          esac
     13@@ -104,12 +104,8 @@
     14             exit 1
     15         fi
    1616 
    17 -        LINKFLAGS="-shared -Wl,-soname,libjcpuid-${ARCH}-${UNIXTYPE}.so"
     17-        LDFLAGS="${LDFLAGS} -shared -Wl,-soname,libjcpuid-${ARCH}-${UNIXTYPE}.so"
    1818-        if [ $KFREEBSD -eq 1 ]; then
    1919-            LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-${ARCH}-kfreebsd.so"
     
    2121-            LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-${ARCH}-${UNIXTYPE}.so"
    2222-        fi
    23 +        LINKFLAGS="-shared -Wl,-soname,libjcpuid.so"
     23+        LDFLAGS="${LDFLAGS} -shared -Wl,-soname,libjcpuid.so"
    2424+        LIBFILE="../jbigi/libjcpuid.so"
    25          COMPILEFLAGS="-fPIC -Wall"
     25         CFLAGS="${CFLAGS} -fPIC -Wall"
    2626         INCLUDES="-I. -Iinclude -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${UNIXTYPE}";;
    2727 esac
Note: See TracChangeset for help on using the changeset viewer.