Changeset d7e1f62
- Timestamp:
- Jun 1, 2016 5:45:27 PM (5 years ago)
- Branches:
- master
- Children:
- 1583f35
- Parents:
- dbd1ae0d
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
core/c/jbigi/build_jbigi.sh
rdbd1ae0d rd7e1f62 5 5 [ -z "$CC" ] && CC="gcc" 6 6 7 UNAME="$(uname -m)" 7 8 if [ -z $BITS ]; then 8 UNAME="$(uname -a)" 9 if test "${UNAME#*x86_64}" != "x86_&4"; then 9 if test "${UNAME#*x86_64}" != "$UNAME"; then 10 10 BITS=64 11 elif test "${UNAME#*i386}" != " i386"; then11 elif test "${UNAME#*i386}" != "$UNAME"; then 12 12 BITS=32 13 elif test "${UNAME#*i686}" != " i686"; then13 elif test "${UNAME#*i686}" != "$UNAME"; then 14 14 BITS=32 15 elif test "${UNAME#*armv6}" != " armv6"; then15 elif test "${UNAME#*armv6}" != "$UNAME"; then 16 16 BITS=32 17 elif test "${UNAME#*armv7}" != " armv7"; then17 elif test "${UNAME#*armv7}" != "$UNAME"; then 18 18 BITS=32 19 elif test "${UNAME#*aarch32}" != " aarch32"; then19 elif test "${UNAME#*aarch32}" != "$UNAME"; then 20 20 BITS=32 21 elif test "${UNAME#*aarch64}" != " aarch64"; then21 elif test "${UNAME#*aarch64}" != "$UNAME"; then 22 22 BITS=64 23 23 else 24 24 25 25 echo "Unable to detect default setting for BITS variable" 26 exit 26 exit 1 27 27 fi 28 28 … … 86 86 fi 87 87 88 [ $BITS -eq 32 ] && COMPILEFLAGS="-m32 $COMPILEFLAGS" && LINKFLAGS="-m32 $LINKFLAGS"89 [ $BITS -eq 64 ] && COMPILEFLAGS="-m64 $COMPILEFLAGS" && LINKFLAGS="-m64 $LINKFLAGS"88 [ $BITS -eq 32 -a "${UNAME#*86}" != "$UNAME" ] && COMPILEFLAGS="-m32 $COMPILEFLAGS" && LINKFLAGS="-m32 $LINKFLAGS" 89 [ $BITS -eq 64 -a "${UNAME#*86}" != "$UNAME" ] && COMPILEFLAGS="-m64 $COMPILEFLAGS" && LINKFLAGS="-m64 $LINKFLAGS" 90 90 91 91 echo "Compiling C code..." -
core/c/jcpuid/build.sh
rdbd1ae0d rd7e1f62 20 20 *) 21 21 echo "Unsupported build environment" 22 exit ;;22 exit 1;; 23 23 esac 24 24 25 25 26 26 if [ -z $BITS ]; then 27 UNAME="$(uname - a)"28 if test "${UNAME#*x86_64}" != " x86_&4"; then27 UNAME="$(uname -m)" 28 if test "${UNAME#*x86_64}" != "$UNAME"; then 29 29 BITS=64 30 elif test "${UNAME#*i386}" != " i386"; then30 elif test "${UNAME#*i386}" != "$UNAME"; then 31 31 BITS=32 32 elif test "${UNAME#*i686}" != " i686"; then32 elif test "${UNAME#*i686}" != "$UNAME"; then 33 33 BITS=32 34 elif test "${UNAME#*armv6}" != " armv6"; then34 elif test "${UNAME#*armv6}" != "$UNAME"; then 35 35 BITS=32 36 elif test "${UNAME#*armv7}" != " armv7"; then36 elif test "${UNAME#*armv7}" != "$UNAME"; then 37 37 BITS=32 38 elif test "${UNAME#*aarch32}" != " aarch32"; then38 elif test "${UNAME#*aarch32}" != "$UNAME"; then 39 39 BITS=32 40 elif test "${UNAME#*aarch64}" != " aarch64"; then40 elif test "${UNAME#*aarch64}" != "$UNAME"; then 41 41 BITS=64 42 42 else 43 43 44 44 echo "Unable to detect default setting for BITS variable" 45 exit 45 exit 1 46 46 fi 47 47 -
debian/patches/0002-jbigi-soname.patch
rdbd1ae0d rd7e1f62 24 24 *) 25 25 @@ -89,8 +89,8 @@ 26 [ $BITS -eq 64 ] && COMPILEFLAGS="-m64 $COMPILEFLAGS" && LINKFLAGS="-m64 $LINKFLAGS"26 [ $BITS -eq 64 -a "${UNAME#*86}" != "$UNAME" ] && COMPILEFLAGS="-m64 $COMPILEFLAGS" && LINKFLAGS="-m64 $LINKFLAGS" 27 27 28 28 echo "Compiling C code..." -
history.txt
rdbd1ae0d rd7e1f62 1 2016-06-01 zzz 2 * Build: Fix Debian build on ARM (ticket #1801) 3 1 4 2016-05-29 zzz 2 5 * Console: Fix /configfamily form (ticket #1797) -
router/java/src/net/i2p/router/RouterVersion.java
rdbd1ae0d rd7e1f62 19 19 public final static String ID = "Monotone"; 20 20 public final static String VERSION = CoreVersion.VERSION; 21 public final static long BUILD = 1 5;21 public final static long BUILD = 16; 22 22 23 23 /** for example "-test" */ 24 public final static String EXTRA = " ";24 public final static String EXTRA = "-rc"; 25 25 public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; 26 26 public static void main(String args[]) {
Note: See TracChangeset
for help on using the changeset viewer.