mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-22 17:31:58 -05:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Except in the Lua port's Makefile patch, I couldn't figure this out...
This commit is contained in:
Linus Groh 2021-03-11 21:46:53 +01:00 committed by Andreas Kling
parent f9cf6bfce1
commit 7cb9237be9
9 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ports/.port_include.sh
View file

@ -7,6 +7,8 @@ export SERENITY_ARCH=i686
export SERENITY_BUILD_DIR="${SERENITY_ROOT}/Build/${SERENITY_ARCH}" export SERENITY_BUILD_DIR="${SERENITY_ROOT}/Build/${SERENITY_ARCH}"
export CC=i686-pc-serenity-gcc export CC=i686-pc-serenity-gcc
export CXX=i686-pc-serenity-g++ 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 export PATH=$SERENITY_ROOT/Toolchain/Local/i686/bin:$PATH
packagesdb="${SERENITY_BUILD_DIR}/packages.db" packagesdb="${SERENITY_BUILD_DIR}/packages.db"

2
Ports/dmidecode/package.sh
View file

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

2
Ports/ed/package.sh
View file

@ -6,5 +6,5 @@ useconfigure=true
depends=pcre2 depends=pcre2
configure() { configure() {
run ./"$configscript" CC=i686-pc-serenity-gcc run ./"$configscript"
} }

2
Ports/figlet/package.sh
View file

@ -2,4 +2,4 @@
port=figlet port=figlet
version=2.2.5 version=2.2.5
files="http://ftp.figlet.org/pub/figlet/program/unix/figlet-${version}.tar.gz figlet-${version}.tar.gz d88cb33a14f1469fff975d021ae2858e" files="http://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}"

2
Ports/klong/package.sh
View file

@ -3,4 +3,4 @@ port=klong
version=20190926 version=20190926
files="http://t3x.org/klong/klong20190926.tgz klong20190926.tgz" files="http://t3x.org/klong/klong20190926.tgz klong20190926.tgz"
useconfigure=false useconfigure=false
workdir=klong klong

2
Ports/klong/patches/klong.patch
View file

@ -3,7 +3,7 @@
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
CFLAGS= -g -Wall -pedantic -O3 CFLAGS= -g -Wall -pedantic -O3
-CC= cc $(CFLAGS) -CC= cc $(CFLAGS)
+CC= i686-pc-serenity-gcc $(CFLAGS) +CC:= $(CC) $(CFLAGS)
V= 20190330 V= 20190330
R= 20190926 R= 20190926

3
Ports/lua/patches/lua.patch
View file

@ -22,11 +22,12 @@ diff -Naur lua-5.3.5/src/Makefile lua-5.3.5.serenity/src/Makefile
LUA_A= liblua.a LUA_A= liblua.a
CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ 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: solaris:
$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN -D_REENTRANT" SYSLIBS="-ldl" $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN -D_REENTRANT" SYSLIBS="-ldl"
+serenity: +serenity:
+ # FIXME: Replace these with $CC, $AR, $RANLIB
+ $(MAKE) $(ALL) \ + $(MAKE) $(ALL) \
+ CC="i686-pc-serenity-gcc -std=gnu99" \ + CC="i686-pc-serenity-gcc -std=gnu99" \
+ AR="i686-pc-serenity-ar rcu" \ + AR="i686-pc-serenity-ar rcu" \

2
Ports/ninja/package.sh
View file

@ -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" files="https://github.com/ninja-build/ninja/archive/v${version}.tar.gz ninja-v${version}.tar.gz"
build() { build() {
CXX=i686-pc-serenity-g++ CXXFLAGS="--sysroot=${SERENITY_BUILD_DIR}/Root" \ CXXFLAGS="--sysroot=${SERENITY_BUILD_DIR}/Root" \
LDFLAGS="--sysroot=${SERENITY_BUILD_DIR}/Root" \ LDFLAGS="--sysroot=${SERENITY_BUILD_DIR}/Root" \
# platform=linux is close enough. # platform=linux is close enough.
run ./configure.py --bootstrap --platform=linux run ./configure.py --bootstrap --platform=linux

2
Ports/tinyscheme/package.sh
View file

@ -6,7 +6,7 @@ files="https://downloads.sourceforge.net/project/tinyscheme/tinyscheme/tinyschem
useconfigure=false useconfigure=false
build() { 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() { install() {