projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update lighttpd to new upstream release (v1.4.6)
[openwrt.git]
/
package
/
zlib
/
Makefile
diff --git
a/package/zlib/Makefile
b/package/zlib/Makefile
index
19b4839
..
2d88d51
100644
(file)
--- a/
package/zlib/Makefile
+++ b/
package/zlib/Makefile
@@
-4,14
+4,12
@@
include $(TOPDIR)/rules.mk
PKG_NAME:=zlib
PKG_VERSION:=1.2.2
PKG_NAME:=zlib
PKG_VERSION:=1.2.2
-PKG_RELEASE:=
1
-PKG_MD5SUM:=
68bd51aaa6558c3bc3fd4890e53413de
+PKG_RELEASE:=
2
+PKG_MD5SUM:=
1b8aab042d40979e456194c468fd72c5
-PKG_SOURCE_URL:=\
- http://www.zlib.net/ \
- http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
+PKG_SOURCE_URL:=@SF/zlib
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_CAT:=bzcat
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
@@
-23,11
+21,13
@@
$(eval $(call PKG_template,ZLIB,zlib,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
(cd $(PKG_BUILD_DIR); \
$(TARGET_CONFIGURE_OPTS) \
$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
(cd $(PKG_BUILD_DIR); \
$(TARGET_CONFIGURE_OPTS) \
+ LDSHARED="$(TARGET_CC) -shared -Wl,-soname,libz.so.1" \
+ CFLAGS="$(TARGET_CFLAGS) $(CFLAGS_LARGEFILE)" \
./configure \
--prefix=/usr \
--shared \
);
./configure \
--prefix=/usr \
--shared \
);
- touch $
(PKG_BUILD_DIR)/.configured
+ touch $
@
$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
$(MAKE) -C $(PKG_BUILD_DIR) \
$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
$(MAKE) -C $(PKG_BUILD_DIR) \
@@
-38,7
+38,7
@@
$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
$(MAKE) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \
install
$(MAKE) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \
install
- touch $
(PKG_BUILD_DIR)/.built
+ touch $
@
$(IPKG_ZLIB):
install -m0755 -d $(IDIR_ZLIB)/usr/lib
$(IPKG_ZLIB):
install -m0755 -d $(IDIR_ZLIB)/usr/lib
@@
-48,16
+48,17
@@
$(IPKG_ZLIB):
$(STAGING_DIR)/usr/lib/libz.so: $(PKG_BUILD_DIR)/.built
mkdir -p $(STAGING_DIR)/usr/include
$(STAGING_DIR)/usr/lib/libz.so: $(PKG_BUILD_DIR)/.built
mkdir -p $(STAGING_DIR)/usr/include
- cp -fpR $(PKG_INSTALL_DIR)/usr/include/
z{conf,lib}
.h $(STAGING_DIR)/usr/include
+ cp -fpR $(PKG_INSTALL_DIR)/usr/include/
*
.h $(STAGING_DIR)/usr/include
mkdir -p $(STAGING_DIR)/usr/lib
mkdir -p $(STAGING_DIR)/usr/lib
- cp -fpR $(PKG_INSTALL_DIR)/usr/lib/
libz.{a,so*}
$(STAGING_DIR)/usr/lib
+ cp -fpR $(PKG_INSTALL_DIR)/usr/lib/
*
$(STAGING_DIR)/usr/lib
touch $(STAGING_DIR)/usr/lib/libz.so
install-dev: $(STAGING_DIR)/usr/lib/libz.so
uninstall-dev:
touch $(STAGING_DIR)/usr/lib/libz.so
install-dev: $(STAGING_DIR)/usr/lib/libz.so
uninstall-dev:
- rm -rf $(STAGING_DIR)/usr/include/z{conf,lib}.h
- rm -rf $(STAGING_DIR)/usr/lib/libz.{a,so*}
+ rm -rf $(STAGING_DIR)/usr/include/zconf.h
+ rm -rf $(STAGING_DIR)/usr/include/zlib.h
+ rm -rf $(STAGING_DIR)/usr/lib/libz.*
compile: install-dev
clean: uninstall-dev
compile: install-dev
clean: uninstall-dev
This page took
0.028522 seconds
and
4
git commands to generate.