Skip to content

Commit

Permalink
Fix issues with packaging, more optimizations
Browse files Browse the repository at this point in the history
  • Loading branch information
as-com committed Jun 20, 2016
1 parent 4a1e19e commit 62fa855
Show file tree
Hide file tree
Showing 28 changed files with 380 additions and 379 deletions.
2 changes: 1 addition & 1 deletion build-js.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ emconfigure ./configure --without-simd --without-turbojpeg CFLAGS="-O3"
emmake make
cp .libs/cjpeg ../../cjpeg.bc
cd ../..
emcc -O3 --closure 1 --pre-js src/pre.js --post-js src/post.js -s "EXPORTED_RUNTIME_METHODS=[]" -s ELIMINATE_DUPLICATE_FUNCTIONS=1 -s ALLOW_MEMORY_GROWTH=1 --memory-init-file 0 cjpeg.bc -o src/cjpeg.js -L'./deps/mozjpeg/.libs' -ljpeg
emcc -O3 --closure 1 --pre-js pre.js --post-js post.js -s "EXPORTED_RUNTIME_METHODS=[]" -s ELIMINATE_DUPLICATE_FUNCTIONS=1 -s ALLOW_MEMORY_GROWTH=1 --memory-init-file 0 --js-transform "node output-cleaner.js" cjpeg.bc -o lib/cjpeg.js -L'./deps/mozjpeg/.libs' -ljpeg
2 changes: 1 addition & 1 deletion deps/mozjpeg/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ AUTOCONF = ${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/missing autoc
AUTOHEADER = ${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/missing autoheader
AUTOMAKE = ${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/missing automake-1.15
AWK = gawk
BUILD = 20160619
BUILD = 20160620
CC = /home/andrew/bin/emsdk_portable/emscripten/master/emcc
CCAS = /home/andrew/bin/emsdk_portable/emscripten/master/emcc
CCASDEPMODE = depmode=gcc3
Expand Down
2 changes: 1 addition & 1 deletion deps/mozjpeg/cjpeg
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH

relink_command="(cd /home/andrew/Documents/mozjpeg-js/mozjpeg; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; LD_LIBRARY_PATH=/home/andrew/torch/install/lib:/home/andrew/torch/install/lib:; export LD_LIBRARY_PATH; PATH=/home/andrew/bin/emsdk_portable/emscripten/master/system/bin:/home/andrew/bin/emsdk_portable:/home/andrew/bin/emsdk_portable/clang/fastcomp/build_master_64/bin:/home/andrew/bin/emsdk_portable/node/4.1.1_64bit/bin:/home/andrew/bin/emsdk_portable/emscripten/master:/home/andrew/torch/install/bin:/home/andrew/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin; export PATH; /home/andrew/bin/emsdk_portable/emscripten/master/emcc -DGIF_SUPPORTED -DPPM_SUPPORTED -DBMP_SUPPORTED -DTARGA_SUPPORTED -O3 -o \$progdir/\$file cjpeg-cdjpeg.o cjpeg-cjpeg.o cjpeg-rdgif.o cjpeg-rdppm.o cjpeg-rdswitch.o cjpeg-rdjpeg.o cjpeg-rdbmp.o cjpeg-rdtarga.o ./.libs/libjpeg.so -lm -Wl,-rpath -Wl,/home/andrew/Documents/mozjpeg-js/mozjpeg/.libs -Wl,-rpath -Wl,/opt/mozjpeg/lib64)"
relink_command="(cd /home/andrew/Documents/mozjpeg-js/deps/mozjpeg; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; LD_LIBRARY_PATH=/home/andrew/torch/install/lib:/home/andrew/torch/install/lib:; export LD_LIBRARY_PATH; PATH=/home/andrew/bin/emsdk_portable/emscripten/master/system/bin:/home/andrew/bin/emsdk_portable:/home/andrew/bin/emsdk_portable/clang/fastcomp/build_master_64/bin:/home/andrew/bin/emsdk_portable/node/4.1.1_64bit/bin:/home/andrew/bin/emsdk_portable/emscripten/master:/home/andrew/torch/install/bin:/home/andrew/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin; export PATH; /home/andrew/bin/emsdk_portable/emscripten/master/emcc -DGIF_SUPPORTED -DPPM_SUPPORTED -DBMP_SUPPORTED -DTARGA_SUPPORTED -O3 -o \$progdir/\$file cjpeg-cdjpeg.o cjpeg-cjpeg.o cjpeg-rdgif.o cjpeg-rdppm.o cjpeg-rdswitch.o cjpeg-rdjpeg.o cjpeg-rdbmp.o cjpeg-rdtarga.o ./.libs/libjpeg.so -lm -Wl,-rpath -Wl,/home/andrew/Documents/mozjpeg-js/deps/mozjpeg/.libs -Wl,-rpath -Wl,/opt/mozjpeg/lib64)"

# This environment variable determines our operation mode.
if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
Expand Down
2 changes: 1 addition & 1 deletion deps/mozjpeg/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/* #undef BITS_IN_JSAMPLE */

/* libjpeg-turbo build number */
#define BUILD "20160619"
#define BUILD "20160620"

/* Support arithmetic encoding */
#define C_ARITH_CODING_SUPPORTED 1
Expand Down
4 changes: 2 additions & 2 deletions deps/mozjpeg/config.status
Original file line number Diff line number Diff line change
Expand Up @@ -830,7 +830,7 @@ S["am__EXEEXT_FALSE"]=""
S["am__EXEEXT_TRUE"]="#"
S["LTLIBOBJS"]=""
S["LIBOBJS"]=""
S["BUILD"]="20160619"
S["BUILD"]="20160620"
S["DEBARCH"]="amd64"
S["RPM_CONFIG_ARGS"]=" --without-turbojpeg --without-simd"
S["RPMARCH"]="x86_64"
Expand Down Expand Up @@ -1089,7 +1089,7 @@ D["MOZJPEG_VERSION"]=" 3.1"
D["INLINE"]=" inline __attribute__((always_inline))"
D["C_ARITH_CODING_SUPPORTED"]=" 1"
D["D_ARITH_CODING_SUPPORTED"]=" 1"
D["BUILD"]=" \"20160619\""
D["BUILD"]=" \"20160620\""
for (key in D) D_is_set[key] = 1
FS = ""
}
Expand Down
2 changes: 1 addition & 1 deletion deps/mozjpeg/djpeg
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH

relink_command="(cd /home/andrew/Documents/mozjpeg-js/mozjpeg; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; LD_LIBRARY_PATH=/home/andrew/torch/install/lib:/home/andrew/torch/install/lib:; export LD_LIBRARY_PATH; PATH=/home/andrew/bin/emsdk_portable/emscripten/master/system/bin:/home/andrew/bin/emsdk_portable:/home/andrew/bin/emsdk_portable/clang/fastcomp/build_master_64/bin:/home/andrew/bin/emsdk_portable/node/4.1.1_64bit/bin:/home/andrew/bin/emsdk_portable/emscripten/master:/home/andrew/torch/install/bin:/home/andrew/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin; export PATH; /home/andrew/bin/emsdk_portable/emscripten/master/emcc -DGIF_SUPPORTED -DPPM_SUPPORTED -DBMP_SUPPORTED -DTARGA_SUPPORTED -O3 -o \$progdir/\$file djpeg-cdjpeg.o djpeg-djpeg.o djpeg-rdcolmap.o djpeg-rdswitch.o djpeg-wrgif.o djpeg-wrppm.o djpeg-wrbmp.o djpeg-wrtarga.o ./.libs/libjpeg.so -lm -Wl,-rpath -Wl,/home/andrew/Documents/mozjpeg-js/mozjpeg/.libs -Wl,-rpath -Wl,/opt/mozjpeg/lib64)"
relink_command="(cd /home/andrew/Documents/mozjpeg-js/deps/mozjpeg; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; LD_LIBRARY_PATH=/home/andrew/torch/install/lib:/home/andrew/torch/install/lib:; export LD_LIBRARY_PATH; PATH=/home/andrew/bin/emsdk_portable/emscripten/master/system/bin:/home/andrew/bin/emsdk_portable:/home/andrew/bin/emsdk_portable/clang/fastcomp/build_master_64/bin:/home/andrew/bin/emsdk_portable/node/4.1.1_64bit/bin:/home/andrew/bin/emsdk_portable/emscripten/master:/home/andrew/torch/install/bin:/home/andrew/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin; export PATH; /home/andrew/bin/emsdk_portable/emscripten/master/emcc -DGIF_SUPPORTED -DPPM_SUPPORTED -DBMP_SUPPORTED -DTARGA_SUPPORTED -O3 -o \$progdir/\$file djpeg-cdjpeg.o djpeg-djpeg.o djpeg-rdcolmap.o djpeg-rdswitch.o djpeg-wrgif.o djpeg-wrppm.o djpeg-wrbmp.o djpeg-wrtarga.o ./.libs/libjpeg.so -lm -Wl,-rpath -Wl,/home/andrew/Documents/mozjpeg-js/deps/mozjpeg/.libs -Wl,-rpath -Wl,/opt/mozjpeg/lib64)"

# This environment variable determines our operation mode.
if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
Expand Down
2 changes: 1 addition & 1 deletion deps/mozjpeg/java/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ AUTOCONF = ${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/missing autoc
AUTOHEADER = ${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/missing autoheader
AUTOMAKE = ${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/missing automake-1.15
AWK = gawk
BUILD = 20160619
BUILD = 20160620
CC = /home/andrew/bin/emsdk_portable/emscripten/master/emcc
CCAS = /home/andrew/bin/emsdk_portable/emscripten/master/emcc
CCASDEPMODE = depmode=gcc3
Expand Down
2 changes: 1 addition & 1 deletion deps/mozjpeg/jconfigint.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* jconfigint.h. Generated from jconfigint.h.in by configure. */
/* libjpeg-turbo build number */
#define BUILD "20160619"
#define BUILD "20160620"

/* How to obtain function inlining. */
#define INLINE inline __attribute__((always_inline))
Expand Down
2 changes: 1 addition & 1 deletion deps/mozjpeg/jcstest
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH

relink_command="(cd /home/andrew/Documents/mozjpeg-js/mozjpeg; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; LD_LIBRARY_PATH=/home/andrew/torch/install/lib:/home/andrew/torch/install/lib:; export LD_LIBRARY_PATH; PATH=/home/andrew/bin/emsdk_portable/emscripten/master/system/bin:/home/andrew/bin/emsdk_portable:/home/andrew/bin/emsdk_portable/clang/fastcomp/build_master_64/bin:/home/andrew/bin/emsdk_portable/node/4.1.1_64bit/bin:/home/andrew/bin/emsdk_portable/emscripten/master:/home/andrew/torch/install/bin:/home/andrew/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin; export PATH; /home/andrew/bin/emsdk_portable/emscripten/master/emcc -O3 -o \$progdir/\$file jcstest.o ./.libs/libjpeg.so -lm -Wl,-rpath -Wl,/home/andrew/Documents/mozjpeg-js/mozjpeg/.libs -Wl,-rpath -Wl,/opt/mozjpeg/lib64)"
relink_command="(cd /home/andrew/Documents/mozjpeg-js/deps/mozjpeg; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; LD_LIBRARY_PATH=/home/andrew/torch/install/lib:/home/andrew/torch/install/lib:; export LD_LIBRARY_PATH; PATH=/home/andrew/bin/emsdk_portable/emscripten/master/system/bin:/home/andrew/bin/emsdk_portable:/home/andrew/bin/emsdk_portable/clang/fastcomp/build_master_64/bin:/home/andrew/bin/emsdk_portable/node/4.1.1_64bit/bin:/home/andrew/bin/emsdk_portable/emscripten/master:/home/andrew/torch/install/bin:/home/andrew/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin; export PATH; /home/andrew/bin/emsdk_portable/emscripten/master/emcc -O3 -o \$progdir/\$file jcstest.o ./.libs/libjpeg.so -lm -Wl,-rpath -Wl,/home/andrew/Documents/mozjpeg-js/deps/mozjpeg/.libs -Wl,-rpath -Wl,/opt/mozjpeg/lib64)"

# This environment variable determines our operation mode.
if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
Expand Down
2 changes: 1 addition & 1 deletion deps/mozjpeg/jpegtran
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH

relink_command="(cd /home/andrew/Documents/mozjpeg-js/mozjpeg; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; LD_LIBRARY_PATH=/home/andrew/torch/install/lib:/home/andrew/torch/install/lib:; export LD_LIBRARY_PATH; PATH=/home/andrew/bin/emsdk_portable/emscripten/master/system/bin:/home/andrew/bin/emsdk_portable:/home/andrew/bin/emsdk_portable/clang/fastcomp/build_master_64/bin:/home/andrew/bin/emsdk_portable/node/4.1.1_64bit/bin:/home/andrew/bin/emsdk_portable/emscripten/master:/home/andrew/torch/install/bin:/home/andrew/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin; export PATH; /home/andrew/bin/emsdk_portable/emscripten/master/emcc -O3 -o \$progdir/\$file jpegtran.o rdswitch.o cdjpeg.o transupp.o ./.libs/libjpeg.so -lm -Wl,-rpath -Wl,/home/andrew/Documents/mozjpeg-js/mozjpeg/.libs -Wl,-rpath -Wl,/opt/mozjpeg/lib64)"
relink_command="(cd /home/andrew/Documents/mozjpeg-js/deps/mozjpeg; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; LD_LIBRARY_PATH=/home/andrew/torch/install/lib:/home/andrew/torch/install/lib:; export LD_LIBRARY_PATH; PATH=/home/andrew/bin/emsdk_portable/emscripten/master/system/bin:/home/andrew/bin/emsdk_portable:/home/andrew/bin/emsdk_portable/clang/fastcomp/build_master_64/bin:/home/andrew/bin/emsdk_portable/node/4.1.1_64bit/bin:/home/andrew/bin/emsdk_portable/emscripten/master:/home/andrew/torch/install/bin:/home/andrew/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin; export PATH; /home/andrew/bin/emsdk_portable/emscripten/master/emcc -O3 -o \$progdir/\$file jpegtran.o rdswitch.o cdjpeg.o transupp.o ./.libs/libjpeg.so -lm -Wl,-rpath -Wl,/home/andrew/Documents/mozjpeg-js/deps/mozjpeg/.libs -Wl,-rpath -Wl,/opt/mozjpeg/lib64)"

# This environment variable determines our operation mode.
if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
Expand Down
2 changes: 1 addition & 1 deletion deps/mozjpeg/jpegyuv
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ DUALCASE=1; export DUALCASE # for MKS sh
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH

relink_command="(cd /home/andrew/Documents/mozjpeg-js/mozjpeg; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; LD_LIBRARY_PATH=/home/andrew/torch/install/lib:/home/andrew/torch/install/lib:; export LD_LIBRARY_PATH; PATH=/home/andrew/bin/emsdk_portable/emscripten/master/system/bin:/home/andrew/bin/emsdk_portable:/home/andrew/bin/emsdk_portable/clang/fastcomp/build_master_64/bin:/home/andrew/bin/emsdk_portable/node/4.1.1_64bit/bin:/home/andrew/bin/emsdk_portable/emscripten/master:/home/andrew/torch/install/bin:/home/andrew/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin; export PATH; /home/andrew/bin/emsdk_portable/emscripten/master/emcc -O3 -o \$progdir/\$file jpegyuv.o ./.libs/libjpeg.so -lm -Wl,-rpath -Wl,/home/andrew/Documents/mozjpeg-js/mozjpeg/.libs -Wl,-rpath -Wl,/opt/mozjpeg/lib64)"
relink_command="(cd /home/andrew/Documents/mozjpeg-js/deps/mozjpeg; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; LD_LIBRARY_PATH=/home/andrew/torch/install/lib:/home/andrew/torch/install/lib:; export LD_LIBRARY_PATH; PATH=/home/andrew/bin/emsdk_portable/emscripten/master/system/bin:/home/andrew/bin/emsdk_portable:/home/andrew/bin/emsdk_portable/clang/fastcomp/build_master_64/bin:/home/andrew/bin/emsdk_portable/node/4.1.1_64bit/bin:/home/andrew/bin/emsdk_portable/emscripten/master:/home/andrew/torch/install/bin:/home/andrew/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin; export PATH; /home/andrew/bin/emsdk_portable/emscripten/master/emcc -O3 -o \$progdir/\$file jpegyuv.o ./.libs/libjpeg.so -lm -Wl,-rpath -Wl,/home/andrew/Documents/mozjpeg-js/deps/mozjpeg/.libs -Wl,-rpath -Wl,/opt/mozjpeg/lib64)"

# This environment variable determines our operation mode.
if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
Expand Down
2 changes: 1 addition & 1 deletion deps/mozjpeg/md5/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ AUTOCONF = ${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/missing autoc
AUTOHEADER = ${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/missing autoheader
AUTOMAKE = ${SHELL} /home/andrew/Documents/mozjpeg-js/deps/mozjpeg/missing automake-1.15
AWK = gawk
BUILD = 20160619
BUILD = 20160620
CC = /home/andrew/bin/emsdk_portable/emscripten/master/emcc
CCAS = /home/andrew/bin/emsdk_portable/emscripten/master/emcc
CCASDEPMODE = depmode=gcc3
Expand Down
2 changes: 1 addition & 1 deletion deps/mozjpeg/pkgscripts/makecygwinpkg.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ onexit()

PACKAGE_NAME=mozjpeg
VERSION=3.1
BUILD=20160619
BUILD=20160620
SRCDIR=/home/andrew/Documents/mozjpeg-js/deps/mozjpeg

PREFIX=%{__prefix}
Expand Down
2 changes: 1 addition & 1 deletion deps/mozjpeg/pkgscripts/makedpkg.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ makedeb()

PACKAGE_NAME=mozjpeg
VERSION=3.1
BUILD=20160619
BUILD=20160620
DEBARCH=amd64
SRCDIR=/home/andrew/Documents/mozjpeg-js/deps/mozjpeg
PREFIX=%{__prefix}
Expand Down
2 changes: 1 addition & 1 deletion deps/mozjpeg/pkgscripts/makemacpkg.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ usage()

PACKAGE_NAME=mozjpeg
VERSION=3.1
BUILD=20160619
BUILD=20160620
SRCDIR=/home/andrew/Documents/mozjpeg-js/deps/mozjpeg
BUILDDIR32=/home/andrew/Documents/mozjpeg-js/deps/mozjpeg/osxx86
BUILD32=0
Expand Down
2 changes: 1 addition & 1 deletion deps/mozjpeg/pkgscripts/mozjpeg.spec.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Vendor: Mozilla Research
URL: https://github.com/mozilla/mozjpeg
Group: System Environment/Libraries
#-->Source0: https://github.com/mozilla/mozjpeg/archive/v%{version}.tar.gz
Release: 20160619
Release: 20160620
License: BSD-style
BuildRoot: %{_blddir}/%{name}-buildroot-%{version}-%{release}
Prereq: /sbin/ldconfig
Expand Down
Loading

0 comments on commit 62fa855

Please sign in to comment.