From 2f3d528318431d60fc8eb4eb4cb9f78a3423c6fb Mon Sep 17 00:00:00 2001
From: Jacob Heider <jacob@tea.xyz>
Date: Fri, 27 Jan 2023 21:18:46 -0500
Subject: [PATCH] this builds

---
 projects/gnu.org/binutils/package.yml      |  13 ++-
 projects/gnu.org/glibc/cc-version-10+.diff |  11 --
 projects/gnu.org/glibc/package.yml         | 130 ++++++++++++++++++---
 3 files changed, 123 insertions(+), 31 deletions(-)
 delete mode 100644 projects/gnu.org/glibc/cc-version-10+.diff

diff --git a/projects/gnu.org/binutils/package.yml b/projects/gnu.org/binutils/package.yml
index 9cc7589616..ab5868b97e 100644
--- a/projects/gnu.org/binutils/package.yml
+++ b/projects/gnu.org/binutils/package.yml
@@ -17,9 +17,20 @@ build:
     linux:
       gnu.org/gcc: '*'
   script: |
-    ./configure --prefix={{ prefix }}
+    ./configure $ARGS
     make --jobs {{ hw.concurrency }}
     make install
+  env:
+    ARGS:
+      - --prefix={{ prefix }}
+      - --enable-gold
+      - --enable-ld=default
+      - --enable-plugins
+      - --enable-shared
+      - --disable-werror
+    linux:
+      ARGS:
+        - --enable-64-bit-bfd
 
 test:
   script: objdump -x $(which objdump) | grep -s $TEST_STRING
diff --git a/projects/gnu.org/glibc/cc-version-10+.diff b/projects/gnu.org/glibc/cc-version-10+.diff
deleted file mode 100644
index b77273d451..0000000000
--- a/projects/gnu.org/glibc/cc-version-10+.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru a/configure b/configure
---- a/configure	2023-01-18 00:31:51.985829010 +0000
-+++ b/configure	2023-01-18 00:32:44.298646006 +0000
-@@ -4710,7 +4710,7 @@
-   ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcygnustpi-]*[0-9.]*\).*$/\1/p'`
-   case $ac_prog_version in
-     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
--    4.[4-9].* | 4.[1-9][0-9].* | [5-9].* )
-+    4.[4-9].* | 4.[1-9][0-9].* | [5-9].* | [1-9][0-9].* )
-        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-     *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
\ No newline at end of file
diff --git a/projects/gnu.org/glibc/package.yml b/projects/gnu.org/glibc/package.yml
index d9d1013edc..3f92007f10 100644
--- a/projects/gnu.org/glibc/package.yml
+++ b/projects/gnu.org/glibc/package.yml
@@ -4,19 +4,27 @@ distributable:
 
 versions:
   #TODO HTML listing: https://ftp.gnu.org/gnu/glibc/
-  - 2.24 # This is 2014; it should allow us to support just about anything running.
+  - 2.28
+
+runtime:
+  env:
+    PATH: ${{prefix}}/sbin:$PATH
+    # FIXME: version.raw not recognized here
+    #CFLAGS: -Wl,--dynamic-linker={{prefix}}/lib/ld-{{version.raw}}.so
+    CFLAGS: -Wl,--dynamic-linker={{prefix}}/lib/ld-2.28.so
 
 build:
   dependencies:
     gnu.org/make: '>=3.79'
     gnu.org/gawk: '>=3'
     gnu.org/gcc: '*'
-    gnu.org/binutils: '*'
-    gnu.org/texinfo: '*'
     gnu.org/gettext: '*'
+    gnu.org/texinfo: '*'
+    gnu.org/bison: '*'
     gnu.org/patch: '*'
     perl.org: '*'
     curl.se: '*'
+  working-directory: build
   script: |
     if test "{{hw.platform}}" != "linux"; then
       echo "glibc is only supported on Linux"
@@ -24,38 +32,122 @@ build:
       exit 0
     fi
 
-    # ./configure doesn't recognize $CC versions >9.x
-    patch -p1 <props/cc-version-10+.diff
-
-    # https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=87a698a21646b7ee620923ef5ffa9735471a8ddd
     for DIFF in $DIFFS; do
-      curl | patch -p1
+        curl "$DIFF" | patch -p1 -d..
     done
 
-    mkdir build
-    cd build
-
     ../configure $ARGS
-    make --jobs {{ hw.concurrency }} all
+    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
   test:
     make test
   env:
     DIFFS:
       - https://sourceware.org/git/?p=glibc.git;a=blobdiff_plain;f=configure;h=3b98ec312fc9c8cc605453654a6ca72106ca0185;hp=b959d2d9885e53e6adcd7037f8382720555abd40;hb=87a698a21646b7ee620923ef5ffa9735471a8ddd;hpb=24fdebe75f6df4c0edacb3f0cdc030913920aa4c
       - https://sourceware.org/git/?p=glibc.git;a=blobdiff_plain;f=configure.ac;h=e20034f301fd7d04ab1c4499bfc1eacdb316570c;hp=49b900c1ed68fa4dd1dadca809ceb6e8b237a89c;hb=87a698a21646b7ee620923ef5ffa9735471a8ddd;hpb=24fdebe75f6df4c0edacb3f0cdc030913920aa4c
-    CFLAGS:
-      - -O2
-      - -fPIC
-      # - -U_FORTIFY_SOURCE
-      # - -fno-stack-protector
-    LDFLAGS:
+    SCRIPTS:
+      - catchsegv
+      - ldd
+      - mtrace
+      - sotruss
+      - tzselect
+      - xtrace
     ARGS:
       - --prefix={{ prefix }}
+      - --enable-static-pie
       - --disable-debug
       - --disable-dependency-tracking
       - --disable-silent-rules
+      - --disable-werror
       - --enable-obsolete-rpc
+      - --without-gd
       - --without-selinux
+      - --enable-kernel=2.6.0
+      - --with-binutils={{deps.gnu.org/binutils.prefix}}/bin
+
+test:
+  dependencies:
+    gnu.org/gcc: '*'
+  script: |
+    test "{{hw.platform}}" = "darwin" && exit 0
+    case "{{hw.arch}}" in
+      x86-64) ARCH=x86_64;;
+      aarch64) ARCH=aarch64;;
+      *)
+        echo "Unsupported architecture {{hw.arch}}"
+        exit 1
+        ;;
+    esac
+    cp $FIXTURE test.c
+    gcc \
+      -Wl,--rpath="{{prefix}}/lib" \
+      -std=c11 \
+      -o test \
+      -v \
+      $CFLAGS \
+      test.c \
+      -pthread \
+      -static \
+      -pie
+    ./test
+  fixture: |
+    #define _GNU_SOURCE
+    #include <assert.h>
+    #include <gnu/libc-version.h>
+    #include <stdatomic.h>
+    #include <stdio.h>
+    #include <threads.h>
+
+    atomic_int acnt;
+    int cnt;
+
+    int f(void* thr_data) {
+        for(int n = 0; n < 1000; ++n) {
+            ++cnt;
+            ++acnt;
+        }
+        return 0;
+    }
+
+    int main(int argc, char **argv) {
+        /* Basic library version check. */
+        printf("gnu_get_libc_version() = %s\n", gnu_get_libc_version());
+
+        thrd_t thr[10];
+        for(int n = 0; n < 10; ++n)
+            thrd_create(&thr[n], f, NULL);
+        for(int n = 0; n < 10; ++n)
+            thrd_join(thr[n], NULL);
+        printf("The atomic counter is %u\n", acnt);
+        printf("The non-atomic counter is %u\n", cnt);
+    }
 
-test: false
+provides:
+  - bin/catchsegv
+  - bin/gencat
+  - bin/getconf
+  - bin/getent
+  - bin/iconv
+  - bin/ldd
+  - bin/locale
+  - bin/localedef
+  - bin/makedb
+  - bin/mtrace
+  - bin/pcprofiledump
+  - bin/pldd
+  - bin/rpcgen
+  - bin/sotruss
+  - bin/sprof
+  - bin/tzselect
+  - bin/xtrace  - sbin/iconvconfig
+  - sbin/ldconfig
+  - sbin/nscd
+  - sbin/sln
+  - sbin/zdump
+  - sbin/zic