system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-21 18:15:58 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Ports: Make sure ports are installed into /usr/local

Browse source
This commit is contained in:
Gunnar Beutner 2021-04-15 15:43:18 +02:00 committed by Andreas Kling
parent 960079b020
commit c9d5358685
16 changed files with 57 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ports/SDL2_gfx/package.sh
View file

@ -5,4 +5,4 @@ version=1.0.4
files="https://downloads.sourceforge.net/project/sdl2gfx/SDL2_gfx-${version}.tar.gz SDL2_gfx-${version}.tar.gz"
depends="SDL2"
useconfigure=true
configopts="--with-sdl-prefix=${SERENITY_BUILD_DIR}/Root/usr"
configopts="--with-sdl-prefix=${SERENITY_BUILD_DIR}/Root/usr/local"

3
Ports/SDL2_image/package.sh
View file

@ -8,8 +8,7 @@ files="https://www.libsdl.org/projects/SDL_image/release/SDL2_image-${version}.t
configure() {
run ./configure \
--host="${SERENITY_ARCH}-pc-serenity" \
--with-sdl-prefix="${SERENITY_BUILD_DIR}/Root/usr" \
--prefix="/usr" \
--with-sdl-prefix="${SERENITY_BUILD_DIR}/Root/usr/local" \
--enable-webp=false --enable-webp-shared=false \
LDFLAGS="-lgui -lgfx -lipc -lcore -lm"
}

3
Ports/SDL2_mixer/package.sh
View file

@ -8,8 +8,7 @@ depends="SDL2 libvorbis"
configure() {
run ./configure \
--host="${SERENITY_ARCH}-pc-serenity" \
--with-sdl-prefix="${SERENITY_BUILD_DIR}/Root/usr" \
--prefix="/usr" \
--with-sdl-prefix="${SERENITY_BUILD_DIR}/Root/usr/local" \
--enable-music-opus=false --enable-music-opus-shared=false \
--enable-music-mod-modplug=false --enable-music-mod-modplug-shared=false \
EXTRA_LDFLAGS="-lgui -lgfx -lipc -lcore -lcompression"

2
Ports/SDL2_ttf/package.sh
View file

@ -8,7 +8,7 @@ depends="SDL2 freetype"
configure() {
run ./configure \
--host="${SERENITY_ARCH}-pc-serenity" \
--with-sdl-prefix="${SERENITY_BUILD_DIR}/Root/usr" \
--with-sdl-prefix="${SERENITY_BUILD_DIR}/Root/usr/local" \
--with-x=no \
FT2_CFLAGS="-I${SERENITY_BUILD_DIR}/Root/usr/local/include/freetype2" \
LIBS="-lgui -lgfx -lipc -lcore -lcompress"

12
Ports/emu2/patches/install-prefix.patch Normal file
View file

@ -0,0 +1,12 @@
diff -Naur emu2-ff276eb0a755a3e784f73da00b5db6c1b25c1f83/Makefile emu2-ff276eb0a755a3e784f73da00b5db6c1b25c1f83.serenity/Makefile
--- emu2-ff276eb0a755a3e784f73da00b5db6c1b25c1f83/Makefile 2021-04-14 15:58:46.000000000 +0200
+++ emu2-ff276eb0a755a3e784f73da00b5db6c1b25c1f83.serenity/Makefile 2021-04-16 00:42:15.680769941 +0200
@@ -2,7 +2,7 @@
CFLAGS=-O3 -flto -Wall -g -Werror=implicit-function-declaration -Werror=int-conversion
LDLIBS=-lm
INSTALL=install
-PREFIX=/usr
+PREFIX=/usr/local
OBJS=\
cpu.o\

4
Ports/neofetch/package.sh
View file

@ -5,3 +5,7 @@ version=7.1.0
useconfigure=false
depends="bash jq"
files="https://github.com/dylanaraps/neofetch/archive/${version}.tar.gz neofetch-${version}.tar.gz"
install() {
run make DESTDIR=$DESTDIR PREFIX=/usr/local $installopts install
}

2
Ports/nesalizer/package.sh
View file

@ -1,6 +1,6 @@
#!/usr/bin/env -S bash ../.port_include.sh
port=nesalizer
version=master
makeopts="CONF=release EXTRA=-I${SERENITY_ROOT}/Build/i686/Root/usr/include/SDL2"
makeopts="CONF=release EXTRA=-I${SERENITY_ROOT}/Build/i686/Root/usr/local/include/SDL2"
files="https://github.com/SerenityOS/nesalizer/archive/master.zip nesalizer-master.zip"
depends=SDL2

2
Ports/nethack/patches/install-path.patch
View file

@ -12,7 +12,7 @@ diff -Naur NetHack-NetHack-3.6.6_Released/sys/unix/nethack.sh NetHack-NetHack-3.
+HACKDIR=/var/games/nethack/
export HACKDIR
-HACK=$HACKDIR/nethack
+HACK=/usr/lib/nethack/nethack
+HACK=/usr/local/lib/nethack/nethack
# Since Nethack.ad is installed in HACKDIR, add it to XUSERFILESEARCHPATH
case "x$XUSERFILESEARCHPATH" in

6
Ports/nethack/patches/serenity-hints.patch
View file

@ -13,10 +13,10 @@ diff -Naur NetHack-NetHack-3.6.6_Released/sys/unix/hints/serenity NetHack-NetHac
+
+
+#PREFIX=/usr
+PREFIX=/usr
+PREFIX=/usr/local
+HACKDIR=/var/games/nethack
+SHELLDIR = $(SERENITY_BUILD_DIR)/Root/usr/bin
+INSTDIR=$(SERENITY_BUILD_DIR)/Root/usr/lib/nethack
+SHELLDIR = $(SERENITY_BUILD_DIR)/Root/usr/local/bin
+INSTDIR=$(SERENITY_BUILD_DIR)/Root/usr/local/lib/nethack
+VARDIR = $(SERENITY_BUILD_DIR)/Root$(HACKDIR)
+
+

8
Ports/nyancat/patches/serenity-changes.patch
View file

@ -8,10 +8,10 @@ index 1dd50ef..e435044 100644
install: all
- install src/nyancat /usr/bin/${package}
- gzip -9 -c < nyancat.1 > /usr/share/man/man1/nyancat.1.gz
+ mkdir -p ${DESTDIR}/usr/bin
+ install src/nyancat ${DESTDIR}/usr/bin/${package}
+ mkdir -p ${DESTDIR}/usr/share/man/man1
+ gzip -9 -c < nyancat.1 > ${DESTDIR}/usr/share/man/man1/nyancat.1.gz
+ mkdir -p ${DESTDIR}/usr/local/bin
+ install src/nyancat ${DESTDIR}/usr/local/bin/${package}
+ mkdir -p ${DESTDIR}/usr/local/share/man/man1
+ gzip -9 -c < nyancat.1 > ${DESTDIR}/usr/local/share/man/man1/nyancat.1.gz
.PHONY: FORCE all clean check dist distcheck install
diff --git a/src/nyancat.c b/src/nyancat.c

3
Ports/scummvm/package.sh
View file

@ -9,7 +9,6 @@ configure() {
export LIBS="-lgui -lgfx -lcore"
run ./configure \
--host="${SERENITY_ARCH}-pc-serenity" \
--prefix=/usr \
--opengl-mode=none \
--with-sdl-prefix="${SERENITY_BUILD_DIR}/Root/usr"
--with-sdl-prefix="${SERENITY_BUILD_DIR}/Root/usr/local"
}

8
Ports/sl/patches/serenity-changes.patch
View file

@ -8,7 +8,7 @@ index c3005d2..e071fc9 100644
distclean: clean
+
+install: all
+ mkdir -p ${DESTDIR}/usr/bin
+ install sl ${DESTDIR}/usr/bin/sl
+ mkdir -p ${DESTDIR}/usr/share/man/man1
+ gzip -9 -c < sl.1 > ${DESTDIR}/usr/share/man/man1/sl.1.gz
+ mkdir -p ${DESTDIR}/usr/local/bin
+ install sl ${DESTDIR}/usr/local/bin/sl
+ mkdir -p ${DESTDIR}/usr/local/share/man/man1
+ gzip -9 -c < sl.1 > ${DESTDIR}/usr/local/share/man/man1/sl.1.gz

1
Ports/stress-ng/package.sh
View file

@ -7,4 +7,5 @@ depends=zlib
pre_configure() {
export CFLAGS="-I${SERENITY_BUILD_DIR}/Root/usr/local/include"
export LDFLAGS="-L${SERENITY_BUILD_DIR}/Root/usr/local/lib -lzlib"
}

18
Ports/stress-ng/patches/install-prefix.patch Normal file
View file

@ -0,0 +1,18 @@
diff -Naur stress-ng-0.11.23/Makefile stress-ng-0.11.23.serenity/Makefile
--- stress-ng-0.11.23/Makefile 2021-04-16 00:30:33.161310251 +0200
+++ stress-ng-0.11.23.serenity/Makefile 2021-04-16 00:33:59.731692012 +0200
@@ -53,10 +53,10 @@
CFLAGS += -DBUILD_STATIC
endif
-BINDIR=/usr/bin
-MANDIR=/usr/share/man/man1
-JOBDIR=/usr/share/stress-ng/example-jobs
-BASHDIR=/usr/share/bash-completion/completions
+BINDIR=/usr/local/bin
+MANDIR=/usr/local/share/man/man1
+JOBDIR=/usr/local/share/stress-ng/example-jobs
+BASHDIR=/usr/local/share/bash-completion/completions
#
# Stressors

2
Ports/termcap/package.sh
View file

@ -2,5 +2,5 @@
port=termcap
version=1.3.1
useconfigure=true
configopts="--prefix=${SERENITY_BUILD_DIR}/Root/usr"
configopts="--prefix=${SERENITY_BUILD_DIR}/Root/usr/local"
files="https://ftpmirror.gnu.org/gnu/termcap/termcap-${version}.tar.gz termcap-${version}.tar.gz"

6
Toolchain/CMake/CMakeToolchain.txt
View file

@ -18,9 +18,9 @@ set(SERENITY_BUILD_DIR $ENV{SERENITY_ROOT}/Build/$ENV{SERENITY_ARCH})
# where to read from/write to
set(CMAKE_SYSROOT ${SERENITY_BUILD_DIR}/Root)
set(CMAKE_STAGING_PREFIX ${SERENITY_BUILD_DIR}/Root/usr)
set(CMAKE_INSTALL_PREFIX ${SERENITY_BUILD_DIR}/Root/usr)
set(CMAKE_INSTALL_DATAROOTDIR ${SERENITY_BUILD_DIR}/Root/usr/share)
set(CMAKE_STAGING_PREFIX ${SERENITY_BUILD_DIR}/Root/usr/local)
set(CMAKE_INSTALL_PREFIX ${SERENITY_BUILD_DIR}/Root/usr/local)
set(CMAKE_INSTALL_DATAROOTDIR ${SERENITY_BUILD_DIR}/Root/usr/local/share)
set(CMAKE_C_COMPILER $ENV{SERENITY_ARCH}-pc-serenity-gcc)
set(CMAKE_CXX_COMPILER $ENV{SERENITY_ARCH}-pc-serenity-g++)