[x86] grub: Natively build grub only on x86 linux hosts, cross compile everywhere...

[openwrt.git] / package / zlib / Makefile

diff --git a/package/zlib/Makefile b/package/zlib/Makefile
index df4a475..9cf9219 100644 (file)
--- a/package/zlib/Makefile
+++ b/package/zlib/Makefile
@@ -10,15 +10,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zlib
 PKG_VERSION:=1.2.3
 
 PKG_NAME:=zlib
 PKG_VERSION:=1.2.3

-PKG_RELEASE:=3
+PKG_RELEASE:=5

 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.zlib.net @SF/zlib
 PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.zlib.net @SF/zlib
 PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6

-PKG_CAT:=bzcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 


@@ -33,7 +29,8 @@ define Build/Configure
        (cd $(PKG_BUILD_DIR); \
                $(TARGET_CONFIGURE_OPTS) \
                LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \
        (cd $(PKG_BUILD_DIR); \
                $(TARGET_CONFIGURE_OPTS) \
                LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \

-               CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \
+               CFLAGS="$(TARGET_CFLAGS) -fPIC $(CFLAGS_LARGEFILE)" \
+               UNAME_S="Linux" \

                ./configure \
                        --prefix=/usr \
                        --shared \
                ./configure \
                        --prefix=/usr \
                        --shared \


@@ -43,7 +40,7 @@ endef
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \

-               CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \
+               CFLAGS="$(TARGET_CFLAGS) -fPIC $(CFLAGS_LARGEFILE)" \

                libz.a libz.so
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                libz.a libz.so
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \


@@ -52,21 +49,18 @@ define Build/Compile
 endef
 
 define Build/InstallDev
 endef
 
 define Build/InstallDev

-       mkdir -p $(STAGING_DIR)/usr/include
+       mkdir -p $(1)/usr/include

        $(CP)   $(PKG_INSTALL_DIR)/usr/include/z{conf,lib}.h \
        $(CP)   $(PKG_INSTALL_DIR)/usr/include/z{conf,lib}.h \

-               $(STAGING_DIR)/usr/include/
-       mkdir -p $(STAGING_DIR)/usr/lib
+               $(1)/usr/include/
+       mkdir -p $(1)/usr/lib

        $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libz.{a,so*} \
        $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libz.{a,so*} \

-               $(STAGING_DIR)/usr/lib/
-endef
-       
-define Build/UninstallDev
-       rm -rf  $(STAGING_DIR)/usr/include/z{conf,lib}.h \
-               $(STAGING_DIR)/usr/lib/libz.{a,so*}
+               $(1)/usr/lib/

 endef
 
 endef
 

+# libz.so is needed for openssl (zlib-dynamic)

 define Package/zlib/install
 define Package/zlib/install

-       install -d -m0755 $(1)/usr/lib
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so $(1)/usr/lib/

        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(1)/usr/lib/
 endef
 
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.so.* $(1)/usr/lib/
 endef