Changeset e1d8bd8 in freewrt

Timestamp:

Aug 13, 2025, 3:23:40 AM (4 months ago)

Author:

Waldemar Brodkorb <wbx@…>

Branches:

freewrt_2_0

Children:

d8b7ea7

Parents:

020a75e

git-author:

Waldemar Brodkorb <wbx@…> (08/07/25 20:50:37)

git-committer:

Waldemar Brodkorb <wbx@…> (08/13/25 03:23:40)

Message:

prepare for cleaner header situation, use staging directory

Location:

toolchain

Files:

• gcc/Makefile (modified) (1 diff)
• kernel-headers/Makefile (modified) (1 diff)
• uClibc/Makefile (modified) (2 diffs)

toolchain/gcc/Makefile

@@ -40 +40 @@
                 --enable-languages=c \
                 --disable-shared \
-                --with-sysroot=$(TOOLCHAIN_BUILD_DIR)/uClibc_dev/ \
+                --with-sysroot=$(STAGING_DIR) \
                 --disable-__cxa_atexit \
                 --enable-target-optspace \

toolchain/kernel-headers/Makefile

@@ -43 +43 @@
         -$(CP) ./files/config.$(LINUX_HEADERS_ARCH) $(LINUX_HEADERS_DIR)/.config
         $(MAKE) -C $(LINUX_HEADERS_DIR) ARCH=$(LINUX_HEADERS_ARCH) oldconfig include/linux/version.h
+        mkdir -p $(STAGING_DIR)/usr/include
+        cp -a $(LINUX_HEADERS_DIR)/include/* $(STAGING_DIR)/usr/include
         touch $(LINUX_HEADERS_DIR)/.configured
 

toolchain/uClibc/Makefile

@@ -42 +42 @@
         $(SED) 's,^.*UCLIBC_HAS_LFS.*,UCLIBC_HAS_LFS=y,g' $(PKG_BUILD_DIR)/.config
         $(SED) 's,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g' $(PKG_BUILD_DIR)/.config
-        mkdir -p $(TOOLCHAIN_BUILD_DIR)/uClibc_dev/usr/include
-        mkdir -p $(TOOLCHAIN_BUILD_DIR)/uClibc_dev/usr/lib
-        mkdir -p $(TOOLCHAIN_BUILD_DIR)/uClibc_dev/lib
+        mkdir -p $(STAGING_DIR)/usr/include
+        mkdir -p $(STAGING_DIR)/usr/lib
+        mkdir -p $(STAGING_DIR)/lib
         $(MAKE) -C $(PKG_BUILD_DIR) \
-                PREFIX=$(TOOLCHAIN_BUILD_DIR)/uClibc_dev/ \
+                PREFIX=$(STAGING_DIR) \
                 DEVEL_PREFIX=/usr/ \
-                RUNTIME_PREFIX=$(TOOLCHAIN_BUILD_DIR)/uClibc_dev/ \
+                RUNTIME_PREFIX=$(STAGING_DIR) \
                 HOSTCC="$(HOSTCC)" \
                 CPU_CFLAGS="$(TARGET_CFLAGS)" \
@@ -83 +83 @@
 install: $(STAGING_DIR)/lib/libc.a $(UCLIBC_TARGETS)
 clean: 
-        rm -rf $(PKG_BUILD_DIR) $(TOOLCHAIN_BUILD_DIR)/uClibc_dev
+        rm -rf $(PKG_BUILD_DIR)