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 9cf92197b7b8c5099e009ebfd3f3267ebf8b80da..5cea85fc85e774b7d6657b8c0234567efa03ee01 100644
(file)
--- a/
package/zlib/Makefile
+++ b/
package/zlib/Makefile
@@
-4,17
+4,18
@@
# 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
PKG_NAME:=zlib
include $(TOPDIR)/rules.mk
PKG_NAME:=zlib
-PKG_VERSION:=1.2.
3
-PKG_RELEASE:=
5
+PKG_VERSION:=1.2.
5
+PKG_RELEASE:=
1
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_SOURCE_URL:=http://www.zlib.net @SF/libpng
+PKG_MD5SUM:=be1e89810e66150f5b0327984d8625a0
+
+PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/package.mk
@@
-29,19
+30,19
@@
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)" \
- UNAME_S="Linux" \
+ CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \
./configure \
--prefix=/usr \
--shared \
./configure \
--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)
-fPIC $(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)" \