bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] massive change: replace occurences of -I$(STAGING_DIR)/{include,usr/include} and -L$(STAGING_DIR)/{lib,usr/lib} with $(TARGET_CPPFLAGS) and $(TARGET_LDFLAGS) respectively

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@15480 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico
2009-04-29 12:56:17 +00:00
parent 9c94ea0e32
commit f907dabbe7
106 changed files with 272 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lang/jamvm/Makefile
View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2006-2008 OpenWrt.org
# Copyright (C) 2006-2009 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@ -41,7 +41,7 @@ CONFIGURE_ARGS+= \
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \
CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
CPPFLAGS="$(TARGET_CPPFLAGS)" \
all
endef

2
lang/luaexpat/Makefile
View File

@ -40,7 +40,7 @@ define Build/Compile
LUA_INC="$(STAGING_DIR)/usr/include/" \
LUA_LIBDIR="$(STAGING_DIR)/usr/lib/" \
COMPAT_DIR="$(PKG_BUILD_DIR)/compat-5.1r5" \
LIB_OPTION="-shared -L$(STAGING_DIR)/usr/lib/" \
LIB_OPTION="-shared $(TARGET_LDFLAGS)" \
CC="$(TARGET_CC) $(TARGET_CFLAGS)" \
LD="$(TARGET_CROSS)ld -shared"
endef

3
lang/luafilesystem/Makefile
View File

@ -35,8 +35,7 @@ endef
define Build/Configure
endef
TARGET_CFLAGS += $(FPIC) \
-I$(STAGING_DIR)/usr/include
TARGET_CFLAGS += $(FPIC) $(TARGET_CPPFLAGS)
TARGET_LDFLAGS += -llua

3
lang/luaprofiler/Makefile
View File

@ -33,8 +33,7 @@ define Build/Configure
endef
TARGET_CFLAGS += $(FPIC) \
-I$(STAGING_DIR)/usr/include
TARGET_CFLAGS += $(FPIC) $(TARGET_CPPFLAGS)
TARGET_LDFLAGS += -llua

8
lang/luasec/Makefile
View File

@ -35,10 +35,10 @@ endef
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR)/src linux \
INCDIR="-I$(STAGING_DIR)/usr/include/" \
LIBDIR="-L$(STAGING_DIR)/usr/lib/" \
CC="$(TARGET_CC) $(TARGET_CFLAGS)" \
LD="$(TARGET_CROSS)ld -shared"
INCDIR="$(TARGET_CPPFLAGS)" \
LIBDIR="$(TARGET_LDFLAGS)" \
CC="$(TARGET_CC) $(TARGET_CFLAGS)" \
LD="$(TARGET_CROSS)ld -shared"
endef

4
lang/luasocket/Makefile
View File

@ -37,8 +37,8 @@ endef
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR)/ all \
LIBDIR="-L$(STAGING_DIR)/usr/lib/" \
CC="$(TARGET_CC) $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
LIBDIR="$(TARGET_LDFLAGS)" \
CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
LD="$(TARGET_CROSS)ld -shared"
endef

6
lang/perl/Makefile
View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2006-2008 OpenWrt.org
# Copyright (C) 2006-2009 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@ -101,11 +101,11 @@ define Build/perl/Configure
-$(MAKE) -C $(PKG_BUILD_DIR) clean
sed \
-e 's!%%CC%%!$(TARGET_CC)!g' \
-e 's!%%CFLAGS%%!$(TARGET_CFLAGS) -DUSE_CROSS_COMPILE -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include!g' \
-e 's!%%CFLAGS%%!$(TARGET_CFLAGS) -DUSE_CROSS_COMPILE $(TARGET_CPPFLAGS)!g' \
-e 's!%%CPP%%!$(TARGET_CROSS)gcc -E!g' \
-e 's!%%AR%%!$(TARGET_CROSS)ar!g' \
-e 's!%%LD%%!$(TARGET_CROSS)gcc!g' \
-e 's!%%LDFLAGS%%!-rdynamic -L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib!g' \
-e 's!%%LDFLAGS%%!-rdynamic $(TARGET_LDFLAGS)!g' \
-e 's!%%LIBDIRS%%!$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib!g' \
-e 's!%%INCDIRS%%!$(STAGING_DIR)/include $(STAGING_DIR)/usr/include!g' \
files/config.sh-$(patsubst i386,i486,$(ARCH)).in \