Ports: Remove/replace hardcoded i686-pc-serenity-{gcc,g++,ar,ranlib}

Except in the Lua port's Makefile patch, I couldn't figure this out...
cubiclove · Mar 13, 2021 · 7cb9237 · 7cb9237
1 parent f9cf6bf
commit 7cb9237
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 8 deletions.
diff --git a/Ports/.port_include.sh b/Ports/.port_include.sh
@@ -7,6 +7,8 @@ export SERENITY_ARCH=i686
 export SERENITY_BUILD_DIR="${SERENITY_ROOT}/Build/${SERENITY_ARCH}"
 export CC=i686-pc-serenity-gcc
 export CXX=i686-pc-serenity-g++
+export AR=i686-pc-serenity-ar
+export RANLIB=i686-pc-serenity-ranlib
 export PATH=$SERENITY_ROOT/Toolchain/Local/i686/bin:$PATH
 
 packagesdb="${SERENITY_BUILD_DIR}/packages.db"

diff --git a/Ports/dmidecode/package.sh b/Ports/dmidecode/package.sh
@@ -11,7 +11,7 @@ auth_opts="--keyring ./gnu-keyring.gpg dmidecode-${version}.tar.xz.sig"
 
 install() {
  run make clean
- run make CC=i686-pc-serenity-gcc
+ run make
 }
 
 post_install() {

diff --git a/Ports/ed/package.sh b/Ports/ed/package.sh
@@ -6,5 +6,5 @@ useconfigure=true
 depends=pcre2
 
 configure() {
- run ./"$configscript" CC=i686-pc-serenity-gcc
+ run ./"$configscript"
 }
diff --git a/Ports/figlet/package.sh b/Ports/figlet/package.sh
@@ -2,4 +2,4 @@
 port=figlet
 version=2.2.5
 files="https://ftp.figlet.org/pub/figlet/program/unix/figlet-${version}.tar.gz figlet-${version}.tar.gz d88cb33a14f1469fff975d021ae2858e"
-makeopts="CC=i686-pc-serenity-gcc LD=i686-pc-serenity-gcc"
+makeopts="CC=${CC} LD=${CC}"
diff --git a/Ports/klong/package.sh b/Ports/klong/package.sh
@@ -3,4 +3,4 @@ port=klong
 version=20190926
 files="https://t3x.org/klong/klong20190926.tgz klong20190926.tgz"
 useconfigure=false
-workdir=klong
+ klong
diff --git a/Ports/klong/patches/klong.patch b/Ports/klong/patches/klong.patch
@@ -3,7 +3,7 @@
 @@ -1,12 +1,12 @@
  CFLAGS= -g -Wall -pedantic -O3
 -CC= cc $(CFLAGS)
-+CC= i686-pc-serenity-gcc $(CFLAGS)
++CC:= $(CC) $(CFLAGS)
  V= 20190330
  R= 20190926
 

diff --git a/Ports/lua/patches/lua.patch b/Ports/lua/patches/lua.patch
@@ -22,11 +22,12 @@ diff -Naur lua-5.3.5/src/Makefile lua-5.3.5.serenity/src/Makefile
 
  LUA_A= liblua.a
  CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
-@@ -124,6 +124,13 @@
+@@ -124,6 +124,14 @@
  solaris:
  $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN -D_REENTRANT" SYSLIBS="-ldl"
 
 +serenity:
++ # FIXME: Replace these with $CC, $AR, $RANLIB
 + $(MAKE) $(ALL) \
 + CC="i686-pc-serenity-gcc -std=gnu99" \
 + AR="i686-pc-serenity-ar rcu" \

diff --git a/Ports/ninja/package.sh b/Ports/ninja/package.sh
@@ -4,7 +4,7 @@ version=1.8.2
 files="https://github.com/ninja-build/ninja/archive/v${version}.tar.gz ninja-v${version}.tar.gz"
 
 build() {
- CXX=i686-pc-serenity-g++ CXXFLAGS="--sysroot=${SERENITY_BUILD_DIR}/Root" \
+ CXXFLAGS="--sysroot=${SERENITY_BUILD_DIR}/Root" \
  LDFLAGS="--sysroot=${SERENITY_BUILD_DIR}/Root" \
  # platform=linux is close enough.
  run ./configure.py --bootstrap --platform=linux

diff --git a/Ports/tinyscheme/package.sh b/Ports/tinyscheme/package.sh
@@ -6,7 +6,7 @@ files="https://downloads.sourceforge.net/project/tinyscheme/tinyscheme/tinyschem
 useconfigure=false
 
 build() {
- run make scheme CC="i686-pc-serenity-gcc -fpic -pedantic" SYS_LIBS= FEATURES='-DUSE_NO_FEATURES=1 -DInitFile=\"/usr/local/include/tinyscheme/init.scm\"'
+ run make scheme CC="${CC} -fpic -pedantic" SYS_LIBS= FEATURES='-DUSE_NO_FEATURES=1 -DInitFile=\"/usr/local/include/tinyscheme/init.scm\"'
 }
 
 install() {