- set some kernel related variables for use by packages

diff --git a/package/openswan/openswan.mk b/package/openswan/openswan.mk
index 7c9909ceae770df052b2006e2f6db0701a2ed610..18c19b98f2c84e76ee2059b11ac7b2a5cfa80f28 100644 (file)
--- a/package/openswan/openswan.mk
+++ b/package/openswan/openswan.mk
@@ -32,14 +32,16 @@ $(OPENSWAN_DIR)/$(OPENSWAN_BINARY): $(OPENSWAN_DIR)/.unpacked
        @echo "using kernel $(LINUX_KERNEL)"
        $(TARGET_CONFIGURE_OPTS) \
        $(MAKE) -C $(OPENSWAN_DIR) \
+               CC=$(TARGET_CC) LD=$(TARGET_LD) \
                KERNELSRC=$(LINUX_DIR) DESTDIR=$(TARGET_DIR) INC_USRLOCAL=/usr \
-               CC=$(TARGET_CC) USERCOMPILE="$(OPENSWAN_CFLAGS) $(TARGET_CFLAGS) -I$(TARGET_DIR)/usr/include" LD_LIBRARY_PATH="$(TARGET_DIR)/lib:$(TARGET_DIR)/usr/lib" programs
+               USERCOMPILE="$(OPENSWAN_CFLAGS) $(TARGET_CFLAGS) -I$(TARGET_DIR)/usr/include" programs
 
 $(TARGET_DIR)/$(OPENSWAN_TARGET_BINARY): $(OPENSWAN_DIR)/$(OPENSWAN_BINARY)
        $(TARGET_CONFIGURE_OPTS) \
        $(MAKE) -C $(OPENSWAN_DIR) \
+               CC=$(TARGET_CC) LD=$(TARGET_LD) \
                KERNELSRC=$(LINUX_DIR) DESTDIR=$(TARGET_DIR) INC_USRLOCAL=/usr \
-               CC=$(TARGET_CC) USERCOMPILE="$(OPENSWAN_CFLAGS) $(TARGET_CFLAGS) -I$(TARGET_DIR)/usr/include" LD_LIBRARY_PATH="$(TARGET_DIR)/lib:$(TARGET_DIR)/usr/lib" install
+               USERCOMPILE="$(OPENSWAN_CFLAGS) $(TARGET_CFLAGS) -I$(TARGET_DIR)/usr/include" install
        rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
                $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
 

diff --git a/target/linux26.mk b/target/linux26.mk
index 87020d7545d7a7bef4adbc7a8b8e3f797854bd3f..ef3984b5d18a4bdea6506c768b5063afdae09b22 100644 (file)
--- a/target/linux26.mk
+++ b/target/linux26.mk
@@ -40,6 +40,11 @@ LINUX26_KERNEL=linux-kernel-$(LINUX26_VERSION)-$(KERNEL_ARCH)
 # Version of Linux AFTER patches
 LINUX26_DIR=$(BUILD_DIR)/linux-$(LINUX26_VERSION)
 
+# for packages that need it
+LINUX_VERSION=$(LINUX_VERSION)
+LINUX_DIR=$(LINUX26_DIR)
+LINUX_KERNEL=$(LINUX26_KERNEL)
+
 # kernel patches
 LINUX26_PATCH_DIR=$(BR2_BOARD_PATH)/kernel-patches/