projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[package] firewall: fix chain selection logic, option dest must be ignored for notrac...
[openwrt.git]
/
package
/
zlib
/
Makefile
diff --git
a/package/zlib/Makefile
b/package/zlib/Makefile
index 6c560624f0d623c638fac09d28a7019a157d34cc..5cea85fc85e774b7d6657b8c0234567efa03ee01 100644
(file)
--- a/
package/zlib/Makefile
+++ b/
package/zlib/Makefile
@@
-1,45
+1,48
@@
-# $Id$
+#
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
include $(TOPDIR)/rules.mk
PKG_NAME:=zlib
include $(TOPDIR)/rules.mk
PKG_NAME:=zlib
-PKG_VERSION:=1.2.
3
-PKG_RELEASE:=
3
+PKG_VERSION:=1.2.
5
+PKG_RELEASE:=
1
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.zlib.net @SF/zlib
-PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6
-PKG_CAT:=bzcat
+PKG_SOURCE_URL:=http://www.zlib.net @SF/libpng
+PKG_MD5SUM:=be1e89810e66150f5b0327984d8625a0
-PKG_
INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_
BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
define Package/zlib
include $(INCLUDE_DIR)/package.mk
define Package/zlib
-SECTION:=base
-CATEGORY:=Libraries
-TITLE:=Library implementing the deflate compression method
-DESCRIPTION:=A library implementing the 'deflate' compression method
-URL:=http://www.zlib.net/
+ SECTION:=libs
+ CATEGORY:=Libraries
+ TITLE:=Library implementing the deflate compression method
+ URL:=http://www.zlib.net/
endef
define Build/Configure
(cd $(PKG_BUILD_DIR); \
$(TARGET_CONFIGURE_OPTS) \
LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \
endef
define Build/Configure
(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
)" \
./configure \
./configure \
- --prefix=/usr \
- --shared \
+ --prefix=/usr \
+ --shared \
+ --uname=Linux \
);
endef
define Build/Compile
);
endef
define Build/Compile
- $(MAKE) -C $(PKG_BUILD_DIR) \
+ $(MAKE)
$(PKG_JOBS)
-C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(TARGET_CFLAGS)
$(CFLAGS_LARGEFILE)
" \
- libz.a libz.so
+ CFLAGS="$(TARGET_CFLAGS)" \
+ libz.a libz.so
.$(PKG_VERSION)
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \
@@
-47,21
+50,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 -m0755 -d $(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