KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

remove intrusive patch and find-a-better-way-to-do-it (tm)

Browse source 
SVN-Revision: 3720
This commit is contained in:
Nicolas Thill 2006-05-01 11:29:52 +00:00
parent f9c716496c
commit d4bcf30856
2 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
openwrt/package/lighttpd/Makefile
View file

@ -65,7 +65,7 @@ $(PKG_BUILD_DIR)/.configured:
(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \ CFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ CPPFLAGS="-I$(STAGING_DIR)/usr/include/libxml2 -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
PCRE_LIB="-lpcre" \ PCRE_LIB="-lpcre" \
PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \ PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
@ -111,7 +111,6 @@ $(PKG_BUILD_DIR)/.built:
rm -rf $(PKG_INSTALL_DIR) rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR) mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \ $(MAKE) -C $(PKG_BUILD_DIR) \
STAGING_DIR=$(STAGING_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
all install all install
touch $@ touch $@

12
openwrt/package/lighttpd/patches/501-libxml2_includes.patch
View file

@ -1,12 +0,0 @@
diff -urN lighttpd-1.4.11/src/Makefile.in lighttpd-1.4.11.new/src/Makefile.in
--- lighttpd-1.4.11/src/Makefile.in 2006-03-07 13:21:02.000000000 +0100
+++ lighttpd-1.4.11.new/src/Makefile.in 2006-04-17 00:16:12.000000000 +0200
@@ -409,7 +409,7 @@
STRIP = @STRIP@
U = @U@
VERSION = @VERSION@
-XML_CFLAGS = @XML_CFLAGS@
+XML_CFLAGS = -I$(STAGING_DIR)/usr/include/libxml2
XML_LIBS = @XML_LIBS@
Z_LIB = @Z_LIB@
ac_ct_AR = @ac_ct_AR@