projects
/
oweals
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ip17xx: Initialize VLAN state upon reset
[oweals/openwrt.git]
/
package
/
zlib
/
Makefile
diff --git
a/package/zlib/Makefile
b/package/zlib/Makefile
index 19dc3e65b12a1e95f01b489df0cca146b7b3d562..c6a18378dce9c8c8b3c67009babeec08fdf34abb 100644
(file)
--- a/
package/zlib/Makefile
+++ b/
package/zlib/Makefile
@@
-4,7
+4,6
@@
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
-# $Id$
include $(TOPDIR)/rules.mk
include $(TOPDIR)/rules.mk
@@
-13,7
+12,7
@@
PKG_VERSION:=1.2.3
PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.zlib.net @SF/
zlib
+PKG_SOURCE_URL:=http://www.zlib.net @SF/
libpng
PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6
include $(INCLUDE_DIR)/package.mk
PKG_MD5SUM:=dee233bf288ee795ac96a98cc2e369b6
include $(INCLUDE_DIR)/package.mk
@@
-29,7
+28,7
@@
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)
-fPIC $(CFLAGS_LARGEFILE
)" \
+ CFLAGS="$(TARGET_CFLAGS)
$(FPIC
)" \
UNAME_S="Linux" \
./configure \
--prefix=/usr \
UNAME_S="Linux" \
./configure \
--prefix=/usr \
@@
-40,7
+39,8
@@
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) -fPIC $(CFLAGS_LARGEFILE)" \
+ LDSHARED="$(TARGET_CROSS)ld -shared" \
+ CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \
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) \
@@
-56,11
+56,6
@@
define Build/InstallDev
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.{a,so*} \
$(1)/usr/lib/
endef
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libz.{a,so*} \
$(1)/usr/lib/
endef
-
-define Build/UninstallDev
- rm -rf $(1)/usr/include/z{conf,lib}.h \
- $(1)/usr/lib/libz.{a,so*}
-endef
# libz.so is needed for openssl (zlib-dynamic)
define Package/zlib/install
# libz.so is needed for openssl (zlib-dynamic)
define Package/zlib/install