Browse Source

be sure to create staging target /usr/lib, remove duplicate HOSTCC

Waldemar Brodkorb 8 years ago
parent
commit
ece758372c
2 changed files with 3 additions and 5 deletions
  1. 2 2
      mk/build.mk
  2. 1 3
      toolchain/uclibc-ng/Makefile

+ 2 - 2
mk/build.mk

@@ -21,7 +21,6 @@ DEFCONFIG=		ADK_DEBUG=n \
 			ADK_RUNTIME_START_SERVICES=n \
 			ADK_PACKAGE_BASE_FILES=y \
 			ADK_PACKAGE_KEXECINIT=n \
-			ADK_PACKAGE_SAMBA3=n \
 			ADK_PACKAGE_CLASSPATH=n \
 			ADK_PACKAGE_OPENSSL=n \
 			ADK_PACKAGE_LIBOPENSSL=n \
@@ -179,10 +178,11 @@ ifeq ($(ADK_TARGET_PACKAGE_OPKG),y)
 endif
 
 ${STAGING_TARGET_DIR} ${STAGING_TARGET_DIR}/etc ${STAGING_HOST_DIR}:
+	mkdir -p ${STAGING_TARGET_DIR}/lib
 	mkdir -p ${STAGING_TARGET_DIR}/bin
 	mkdir -p ${STAGING_TARGET_DIR}/etc
 	mkdir -p ${STAGING_TARGET_DIR}/usr/bin
-	mkdir -p ${STAGING_TARGET_DIR}/lib
+	mkdir -p ${STAGING_TARGET_DIR}/usr/lib/pkgconfig
 	mkdir -p ${STAGING_HOST_DIR}/usr/bin
 	mkdir -p ${STAGING_HOST_DIR}/usr/lib
 	mkdir -p ${STAGING_HOST_DIR}/usr/include

+ 1 - 3
toolchain/uclibc-ng/Makefile

@@ -279,10 +279,10 @@ ifeq ($(ADK_TARGET_ABI_O32),y)
 endif
 endif
 	echo N|PATH='$(HOST_PATH)' $(MAKE) $(UCLIBC_MAKEOPTS) -C $(WRKBUILD) \
+		HOSTCC="$(HOST_CC)" \
 		PREFIX=$(STAGING_TARGET_DIR) \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=$(STAGING_TARGET_DIR) \
-		HOSTCC="$(HOST_CC)" \
 		UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
 		UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
 		oldconfig
@@ -295,7 +295,6 @@ $(WRKBUILD)/.compiled: $(WRKBUILD)/.configured
 		PREFIX= \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=/ \
-		HOSTCC="$(HOST_CC)" \
 		UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
 		UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
 		VERBOSE=1 \
@@ -320,7 +319,6 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
 		PREFIX= \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=/ \
-		HOSTCC="$(HOST_CC)" \
 		UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
 		UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
 		TEST_INSTALLED_UCLIBC=1 \