Changeset d0a3c72 for debian


Ignore:
Timestamp:
Nov 19, 2012 10:41:54 PM (8 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
5975b69
Parents:
d94c149
Message:

Improved support for GNU/kFreeBSD

  • add kFreeBSD to NBI and CPUID
  • add kFreeBSD to jcpuid/jbigi build scripts
  • refresh debian patches to compensate for kFreeBSD changes
  • i2prouter: Detect kFreeBSD and normalize its name
  • clean up osid (switching to "elif") and adding support for detecting kFreeBSD
  • update postinstall.sh; I2P cannot be installed using gij so postinstall.sh will not be run. If/when openjdk finally comes to kFreeBSD, we'll be ready for it.
Location:
debian/patches
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • debian/patches/0001-path-substitution.patch

    rd94c149 rd0a3c72  
    108108 then
    109109     COMMAND="$FIXED_COMMAND"
    110 @@ -905,9 +856,6 @@
     110@@ -908,9 +859,6 @@
    111111         # The string passed to eval must handles spaces in paths correctly.
    112112         COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.java.command=\"$JAVABINARY\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" $ANCHORPROP $STATUSPROP $COMMANDPROP $LOCKPROP $LOGPROP $ADDITIONAL_PARA"
     
    118118         eval echo `gettext '$APP_LONG_NAME is already running.'`
    119119         exit 1
    120 @@ -1031,9 +979,6 @@
     120@@ -1034,9 +982,6 @@
    121121         # The string passed to eval must handles spaces in paths correctly.
    122122         COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.java.command=\"$JAVABINARY\" wrapper.pidfile=\"$PIDFILE\" wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\" wrapper.daemonize=TRUE $ANCHORPROP $IGNOREPROP $STATUSPROP $COMMANDPROP $LOCKPROP $LOGPROP $ADDITIONAL_PARA"
     
    128128         eval echo `gettext '$APP_LONG_NAME is already running.'`
    129129         exit 1
    130 @@ -1874,18 +1819,9 @@
     130@@ -1877,18 +1822,9 @@
    131131             status
    132132             ;;
  • debian/patches/0002-jbigi-soname.patch

    rd94c149 rd0a3c72  
    1313--- a/core/c/jbigi/build_jbigi.sh
    1414+++ b/core/c/jbigi/build_jbigi.sh
    15 @@ -37,7 +37,7 @@
    16              UNIXTYPE="solaris"
     15@@ -39,7 +39,7 @@
     16             UNIXTYPE="linux"
    1717         fi
    1818         COMPILEFLAGS="-fPIC -Wall"
     
    2222         LIBFILE="libjbigi.so";;
    2323 *)
    24 @@ -56,7 +56,7 @@
     24@@ -58,7 +58,7 @@
    2525 
    2626 echo "Compiling C code..."
  • debian/patches/0003-renaming-jcpuid.patch

    rd94c149 rd0a3c72  
    99--- a/core/c/jcpuid/build.sh
    1010+++ b/core/c/jcpuid/build.sh
    11 @@ -65,8 +65,8 @@
    12                  exit 1;;
     11@@ -67,12 +67,8 @@
     12                 exit 0;;
    1313         esac
    1414 
    1515-        LINKFLAGS="-shared -Wl,-soname,libjcpuid-${ARCH}-${UNIXTYPE}.so"
    16 -        LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-${ARCH}-${UNIXTYPE}.so"
     16-        if [ $KFREEBSD -eq 1 ]; then
     17-            LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-${ARCH}-kfreebsd.so"
     18-        else
     19-            LIBFILE="lib/freenet/support/CPUInformation/libjcpuid-${ARCH}-${UNIXTYPE}.so"
     20-        fi
    1721+        LINKFLAGS="-shared -Wl,-soname,libjcpuid.so"
    1822+        LIBFILE="../jbigi/libjcpuid.so"
Note: See TracChangeset for help on using the changeset viewer.