mirror of
https://github.com/novatiq/packages.git
synced 2026-04-29 23:18:42 +01:00
treewide: use $(STAGING_DIR)/host instead of $(STAGING_DIR_HOST), sync with changes in trunk
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
This commit is contained in:
+1
-1
@@ -35,7 +35,7 @@ PKG_BUILD_PARALLEL:=1
|
||||
HOST_BUILD_PARALLEL:=1
|
||||
|
||||
# Variables used during configuration/build
|
||||
HOST_PERL_PREFIX:=$(STAGING_DIR_HOST)/usr
|
||||
HOST_PERL_PREFIX:=$(STAGING_DIR)/host/usr
|
||||
|
||||
# Filter -g3, it will break Compress-Raw-Zlib
|
||||
TARGET_CFLAGS_PERL:=$(patsubst -g3,-g,$(TARGET_CFLAGS))
|
||||
|
||||
@@ -4,12 +4,12 @@
|
||||
PERL_VERSION:=5.22
|
||||
|
||||
# Build environment
|
||||
HOST_PERL_PREFIX:=$(STAGING_DIR_HOST)/usr
|
||||
HOST_PERL_PREFIX:=$(STAGING_DIR)/host/usr
|
||||
ifneq ($(CONFIG_USE_GLIBC),)
|
||||
EXTRA_LIBS:=bsd
|
||||
EXTRA_LIBDIRS:=$(STAGING_DIR)/lib
|
||||
endif
|
||||
PERL_CMD:=$(STAGING_DIR_HOST)/usr/bin/perl$(PERL_VERSION).0
|
||||
PERL_CMD:=$(STAGING_DIR)/host/usr/bin/perl$(PERL_VERSION).0
|
||||
|
||||
MOD_CFLAGS_PERL:=-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(TARGET_CFLAGS) $(TARGET_CPPFLAGS)
|
||||
ifdef CONFIG_PERL_THREADS
|
||||
@@ -26,7 +26,7 @@ define perlmod/host/relink
|
||||
rm -f $(1)/Makefile.aperl
|
||||
$(MAKE) -C $(1) perl
|
||||
$(CP) $(1)/perl $(PERL_CMD)
|
||||
$(CP) $(1)/perl $(STAGING_DIR_HOST)/usr/bin/perl
|
||||
$(CP) $(1)/perl $(STAGING_DIR)/host/usr/bin/perl
|
||||
endef
|
||||
|
||||
define perlmod/host/Configure
|
||||
|
||||
Reference in New Issue
Block a user