diff options
| -rw-r--r-- | package/ImageMagick/Makefile | 5 | ||||
| -rw-r--r-- | package/liblzo/Makefile | 10 | ||||
| -rw-r--r-- | package/util-linux-ng/Makefile | 1 | ||||
| -rw-r--r-- | package/zlib/Makefile | 4 |
4 files changed, 14 insertions, 6 deletions
diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile index 8ee6641c6..a86bcbd50 100644 --- a/package/ImageMagick/Makefile +++ b/package/ImageMagick/Makefile @@ -10,7 +10,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= a07a97cfb28b588cbcf83ffa9ec92e3f PKG_DESCR:= image processing and converting utility PKG_SECTION:= multimedia -PKG_BUILDDEP:= jpeg libtiff fontconfig libiconv +PKG_BUILDDEP:= libpng jpeg libtiff fontconfig libiconv PKG_URL:= http://www.imagemagick.org/ PKG_SITES:= http://image_magick.veidrodis.com/image_magick/ PKG_NEED_CXX:= 1 @@ -46,6 +46,9 @@ CONFIGURE_ARGS+= --with-magick-plus-plus=no \ --without-lcms \ --without-lcms2 \ --without-wmf \ + --with-jpeg \ + --with-png \ + --with-tiff \ --enable-fast-install libimagemagick-install: diff --git a/package/liblzo/Makefile b/package/liblzo/Makefile index fb8011912..4aa9a16b2 100644 --- a/package/liblzo/Makefile +++ b/package/liblzo/Makefile @@ -16,15 +16,19 @@ PKG_SUBPKGS:= LIBLZO LIBLZO_DEV PKGSD_LIBLZO_DEV:= lzo library headers PKGSC_LIBLZO_DEV:= devel +ifeq ($(ADK_STATIC),y) +PKG_OPTS:= libonly +endif + include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBLZO,liblzo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBLZO_DEV,liblzo-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBLZO_DEV},${PKGSC_LIBLZO_DEV})) +$(eval $(call PKG_template,LIBLZO,liblzo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},$(PKG_OPTS))) +$(eval $(call PKG_template,LIBLZO_DEV,liblzo-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBLZO_DEV},${PKGSC_LIBLZO_DEV},$(PKG_OPTS))) CONFIGURE_ARGS+= --enable-static MAKE_FLAGS+= CFLAGS_O="${TARGET_CFLAGS}" -liblzo-install: +post-install: ${INSTALL_DIR} ${IDIR_LIBLZO}/usr/lib ${CP} ${WRKINST}/usr/lib/liblzo2.so* ${IDIR_LIBLZO}/usr/lib diff --git a/package/util-linux-ng/Makefile b/package/util-linux-ng/Makefile index 7cdacf554..623025f79 100644 --- a/package/util-linux-ng/Makefile +++ b/package/util-linux-ng/Makefile @@ -41,7 +41,6 @@ CONFIGURE_ARGS+= --disable-use-tty-group \ --disable-libblkid \ --enable-libmount \ --enable-mount -MAKE_FLAGS+= OPT="${TARGET_CFLAGS}" ARCH="${ARCH}" FAKE_FLAGS+= INSTALLSUID="install -m 4755" TARGET_CFLAGS+= -DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK -lintl diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 24b7d3b11..c94c0dcf3 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -38,6 +38,8 @@ ifeq ($(ADK_STATIC),) CONFIGURE_OPTS:= --shared endif +ALL_TARGET:= libz.a libz.so.1.2.5 + do-configure: (cd $(WRKBUILD); $(COPTS) \ uname="Linux" \ @@ -49,7 +51,7 @@ do-configure: $(CONFIGURE_OPTS) \ ); -zlib-install: +post-install: ${INSTALL_DIR} ${IDIR_ZLIB}/usr/lib ${CP} ${WRKBUILD}/libz.so* ${IDIR_ZLIB}/usr/lib |