diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:44:59 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:44:59 +0200 |
commit | b803209ad0f1f198072695109b30a726e0411084 (patch) | |
tree | 3d5db865a71f72457d05fbe37cb25e96d67484f8 /package/zlib | |
parent | faf5bef3ce64c6b15ac9cd4490c74f621cea4b73 (diff) |
fat commit to add support for firefox on ibm x40 via usb stick
- add support for IBM X40 notebook
- add USB boot support
- add firefox package
- update and add all dependencies for firefox
- add xorg intel driver
- add dri support for xorg
Diffstat (limited to 'package/zlib')
-rw-r--r-- | package/zlib/Makefile | 18 | ||||
-rw-r--r-- | package/zlib/patches/patch-Makefile_in | 20 | ||||
-rw-r--r-- | package/zlib/patches/patch-configure | 38 |
3 files changed, 12 insertions, 64 deletions
diff --git a/package/zlib/Makefile b/package/zlib/Makefile index e031baf0a..a31ca4af2 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= zlib -PKG_VERSION:= 1.2.3 -PKG_RELEASE:= 6 -PKG_MD5SUM:= dee233bf288ee795ac96a98cc2e369b6 +PKG_VERSION:= 1.2.4 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 763c6a0b4ad1cdf5549e3ab3f140f4cb PKG_DESCR:= implementation of the deflate compression method PKG_SECTION:= libs PKG_URL:= http://www.zlib.net @@ -24,6 +24,10 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,ZLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) $(eval $(call PKG_template,ZLIB_DEV,${PKG_NAME}-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +SUB_INSTALLS-y:= +SUB_INSTALLS-m:= +SUB_INSTALLS-${ADK_PACKAGE_ZLIB_DEV}+= zlib-dev-install + CONFIG_STYLE:= manual ifeq ($(ADK_NATIVE),) @@ -34,20 +38,22 @@ ifeq ($(ADK_STATIC),) CONFIGURE_OPTS:= --shared endif +#--includedir=$(STAGING_DIR)/usr/include do-configure: (cd $(WRKBUILD); $(COPTS) \ CFLAGS="$(TARGET_CFLAGS) -fPIC" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ ./configure \ - --prefix=$(STAGING_DIR)/usr \ - --includedir=$(STAGING_DIR)/usr/include \ + --prefix=/usr \ $(CONFIGURE_OPTS) \ ); -post-install: +post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} ${INSTALL_DIR} ${IDIR_ZLIB}/usr/lib ${CP} ${WRKBUILD}/libz.so* ${IDIR_ZLIB}/usr/lib + +zlib-dev-install: ${INSTALL_DIR} ${IDIR_ZLIB_DEV}/usr/include ${CP} ${WRKBUILD}/*.h ${IDIR_ZLIB_DEV}/usr/include diff --git a/package/zlib/patches/patch-Makefile_in b/package/zlib/patches/patch-Makefile_in deleted file mode 100644 index c34514a03..000000000 --- a/package/zlib/patches/patch-Makefile_in +++ /dev/null @@ -1,20 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- zlib-1.2.3.orig/Makefile.in 2005-07-18 04:25:21.000000000 +0200 -+++ zlib-1.2.3/Makefile.in 2008-12-31 16:32:48.417074167 +0100 -@@ -34,6 +34,7 @@ SHAREDLIBV=libz.so.1.2.3 - SHAREDLIBM=libz.so.1 - - AR=ar rc -+ARFLAGS=rc - RANLIB=ranlib - TAR=tar - SHELL=/bin/sh -@@ -68,7 +69,7 @@ test: all - fi - - libz.a: $(OBJS) $(OBJA) -- $(AR) $@ $(OBJS) $(OBJA) -+ $(AR) $(ARFLAGS) $@ $(OBJS) $(OBJA) - -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 - - match.o: match.S diff --git a/package/zlib/patches/patch-configure b/package/zlib/patches/patch-configure deleted file mode 100644 index 784f624b5..000000000 --- a/package/zlib/patches/patch-configure +++ /dev/null @@ -1,38 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- zlib-1.2.3.orig/configure 2005-07-11 22:11:57.000000000 +0200 -+++ zlib-1.2.3/configure 2008-12-31 16:43:55.922789768 +0100 -@@ -73,32 +73,9 @@ esac - - if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then - CC="$cc" -- SFLAGS=${CFLAGS-"-fPIC -O3"} -+ SFLAGS=${CFLAGS-"-fPIC -D_REENTRANT"} - CFLAGS="$cflags" -- case `(uname -s || echo unknown) 2>/dev/null` in -- Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};; -- CYGWIN* | Cygwin* | cygwin* | OS/2* ) -- EXE='.exe';; -- QNX*) # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4 -- # (alain.bonnefoy@icbt.com) -- LDSHARED=${LDSHARED-"$cc -shared -Wl,-hlibz.so.1"};; -- HP-UX*) -- LDSHARED=${LDSHARED-"$cc -shared $SFLAGS"} -- case `(uname -m || echo unknown) 2>/dev/null` in -- ia64) -- shared_ext='.so' -- SHAREDLIB='libz.so';; -- *) -- shared_ext='.sl' -- SHAREDLIB='libz.sl';; -- esac;; -- Darwin*) shared_ext='.dylib' -- SHAREDLIB=libz$shared_ext -- SHAREDLIBV=libz.$VER$shared_ext -- SHAREDLIBM=libz.$VER1$shared_ext -- LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER"};; -- *) LDSHARED=${LDSHARED-"$cc -shared"};; -- esac -+ LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"} - else - # find system name and corresponding cc options - CC=${CC-cc} |