diff options
-rw-r--r-- | package/openswan/openswan.mk | 6 | ||||
-rw-r--r-- | target/linux26.mk | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/package/openswan/openswan.mk b/package/openswan/openswan.mk index 7c9909cea..18c19b98f 100644 --- 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 87020d754..ef3984b5d 100644 --- 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/ |