this has to be close...

pkgxdev · Apr 1, 2023 · 536cced · 536cced
1 parent f0356c8
commit 536cced
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/projects/gnu.org/glibc/package.yml b/projects/gnu.org/glibc/package.yml
@@ -20,9 +20,8 @@ build:
     gnu.org/gettext: '*'
     gnu.org/texinfo: '*'
     gnu.org/bison: '*'
-    # gnu.org/patch: '*'
     perl.org: '*'
-    # curl.se: '*'
+    python.org: ^3
   working-directory: build
   script: |
     if test "{{hw.platform}}" != "linux"; then
@@ -33,14 +32,16 @@ build:
     fi
 
     ../configure $ARGS
-    make all -j {{hw.concurrency}}
+    make all #-j {{hw.concurrency}}
     make install
 
     cd {{prefix}}/bin
     for s in $SCRIPTS; do
       sed -i.bak 's|{{prefix}}|"$(cd "$(dirname "$0")/.." \&\& pwd)"|' $s
       rm $s.bak
     done
+
+    ln -s ../lib/ld-{{ version.marketing }}.so ld.so
   test:
     make test
   env:
@@ -79,6 +80,9 @@ test:
       exit 0
     fi
 
+    {{prefix}}/lib/ld-{{ version.marketing }}.so --version
+    ld.so --version
+
     # Putting ourselves in the LD_LIBRARY_PATH breaks literally everything else...
     export LD_LIBRARY_PATH=$(echo LD_LIBRARY_PATH | tr ':' '\n' | grep -v {{prefix}} | tr '\n' ':')
     test "{{hw.platform}}" = "darwin" && exit 0
@@ -93,12 +97,17 @@ test:
     gcc \
       -nostdinc \
       -nostdlib \
-      -Wl,--rpath="{{prefix}}/lib" \
+      -L{{prefix}}/lib \
+      -I{{prefix}}/include \
       -I{{deps.gnu.org/gcc.prefix}}/lib/gcc/$ARCH-unknown-linux-gnu/{{deps.gnu.org/gcc.version}}/include \
+      -Wl,--rpath="{{prefix}}/lib" \
+      -Wl,--dynamic-linker={{prefix}}/lib/ld-{{ version.marketing }}.so \
       -std=c11 \
       -o test \
       -v \
       $CFLAGS \
+      {{prefix}}/lib/crti.o \
+      {{prefix}}/lib/crtn.o \
       test.c \
       -pthread \
       -static \
@@ -115,6 +124,7 @@ provides:
     - bin/getconf
     - bin/getent
     - bin/iconv
+    - bin/ld.so
     - bin/ldd
     - bin/locale
     - bin/localedef
@@ -125,7 +135,7 @@ provides:
     - bin/sotruss
     - bin/sprof
     - bin/tzselect
-    - bin/xtrace 
+    - bin/xtrace
     - sbin/iconvconfig
     - sbin/ldconfig
     - sbin/nscd