diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-18 18:10:19 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-18 18:10:19 +0100 |
| commit | 46b2bb3001ce838ba2483a08418587d8a027f3a9 (patch) | |
| tree | b2b618839b5afcc859fcb90556e6f199d9a9a10c /package/libtiff | |
| parent | 88d3e6d6c572143bd95a589a44e30bfefd616b88 (diff) | |
| parent | 902ee7e7b23751ca7a8264d36a837aa4aae12032 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libtiff')
| -rw-r--r-- | package/libtiff/Makefile | 10 | ||||
| -rw-r--r-- | package/libtiff/patches/patch-Makefile_in | 11 | ||||
| -rw-r--r-- | package/libtiff/patches/patch-config_ltmain_sh | 11 |
3 files changed, 25 insertions, 7 deletions
diff --git a/package/libtiff/Makefile b/package/libtiff/Makefile index ebd9988bf..27060c07f 100644 --- a/package/libtiff/Makefile +++ b/package/libtiff/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libtiff PKG_VERSION:= 3.9.4 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 2006c1bdd12644dbf02956955175afd6 PKG_DESCR:= A library for reading/writing TIFF images PKG_SECTION:= libs @@ -28,13 +28,9 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBTIFF,libtiff,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,LIBTIFF_DEV,libtiff-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBTIFF_DEV},${PKGSC_LIBTIFF_DEV},${PKG_OPTS})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBTIFF_DEV}+= libtiff-dev-install +CONFIGURE_ARGS+= --disable-cxx --disable-rpath -CONFIGURE_ARGS+= --disable-cxx - -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_LIBTIFF}/usr/lib ${CP} ${WRKINST}/usr/lib/libtiff.so* ${IDIR_LIBTIFF}/usr/lib/ diff --git a/package/libtiff/patches/patch-Makefile_in b/package/libtiff/patches/patch-Makefile_in new file mode 100644 index 000000000..529d1cb47 --- /dev/null +++ b/package/libtiff/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- tiff-3.9.4.orig/Makefile.in 2010-06-15 20:58:54.000000000 +0200 ++++ tiff-3.9.4/Makefile.in 2011-01-08 11:52:47.000000000 +0100 +@@ -330,7 +330,7 @@ EXTRA_DIST = \ + nmake.opt + + dist_doc_DATA = $(docfiles) +-SUBDIRS = port libtiff tools build contrib test man html ++SUBDIRS = port libtiff build man + all: all-recursive + + .SUFFIXES: diff --git a/package/libtiff/patches/patch-config_ltmain_sh b/package/libtiff/patches/patch-config_ltmain_sh new file mode 100644 index 000000000..9ac507120 --- /dev/null +++ b/package/libtiff/patches/patch-config_ltmain_sh @@ -0,0 +1,11 @@ +--- tiff-3.9.4.orig/config/ltmain.sh 2010-06-11 22:28:18.000000000 +0200 ++++ tiff-3.9.4/config/ltmain.sh 2011-01-14 00:30:36.000000000 +0100 +@@ -5091,7 +5091,7 @@ func_mode_link () + # @file GCC response files + # -tp=* Portland pgcc target processor selection + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|-fstack-protector*|-flto) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" |