diff options
Diffstat (limited to 'Ports')
53 files changed, 115 insertions, 117 deletions
diff --git a/Ports/README.md b/Ports/README.md index 42ab7d77a5..04c77471a6 100644 --- a/Ports/README.md +++ b/Ports/README.md @@ -190,7 +190,7 @@ keyring and can later be used for verification using [`auth_opts`](#auth_opts). Options passed to `make install` in the default `install` function. -`DESTDIR="${SERENITY_BUILD_DIR}/Root"` (`"${SERENITY_SOURCE_DIR}/Build/${SERENITY_ARCH}/Root"`) +`DESTDIR="${SERENITY_INSTALL_ROOT}"` (`"${SERENITY_SOURCE_DIR}/Build/${SERENITY_ARCH}/Root"`) is always passed, override the `install` function if that's undesirable. #### `makeopts` diff --git a/Ports/SDL2/package.sh b/Ports/SDL2/package.sh index 48641f2763..6483542ef3 100755 --- a/Ports/SDL2/package.sh +++ b/Ports/SDL2/package.sh @@ -4,7 +4,7 @@ version=serenity-git workdir=SDL-main-serenity useconfigure=true files="https://github.com/SerenityOS/SDL/archive/main-serenity.tar.gz SDL2-git.tar.gz" -configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_SOURCE_DIR/Toolchain/CMake/CMakeToolchain.txt -DPULSEAUDIO=OFF -DJACK=OFF" +configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_SOURCE_DIR}/Toolchain/CMake/CMakeToolchain.txt -DPULSEAUDIO=OFF -DJACK=OFF" configure() { run cmake $configopts diff --git a/Ports/SDL2_gfx/package.sh b/Ports/SDL2_gfx/package.sh index 4bb5e7d76a..db2e54cc2d 100755 --- a/Ports/SDL2_gfx/package.sh +++ b/Ports/SDL2_gfx/package.sh @@ -6,9 +6,9 @@ files="https://downloads.sourceforge.net/project/sdl2gfx/SDL2_gfx-${version}.tar auth_type=md5 depends="SDL2" useconfigure=true -configopts="--with-sdl-prefix=${SERENITY_BUILD_DIR}/Root/usr/local" +configopts="--with-sdl-prefix=${SERENITY_INSTALL_ROOT}/usr/local" install() { - run make install DESTDIR=$DESTDIR $installopts - run ${CC} -shared -o $DESTDIR/usr/local/lib/libSDL2_gfx.so -Wl,--whole-archive $DESTDIR/usr/local/lib/libSDL2_gfx.a -Wl,--no-whole-archive + run make install DESTDIR=${SERENITY_INSTALL_ROOT} $installopts + run ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libSDL2_gfx.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libSDL2_gfx.a -Wl,--no-whole-archive } diff --git a/Ports/SDL2_image/package.sh b/Ports/SDL2_image/package.sh index f5c43f3e2b..ac75b670c6 100755 --- a/Ports/SDL2_image/package.sh +++ b/Ports/SDL2_image/package.sh @@ -9,7 +9,7 @@ auth_type=md5 configure() { run ./configure \ --host="${SERENITY_ARCH}-pc-serenity" \ - --with-sdl-prefix="${SERENITY_BUILD_DIR}/Root/usr/local" \ + --with-sdl-prefix="${SERENITY_INSTALL_ROOT}/usr/local" \ --enable-webp=false --enable-webp-shared=false \ LDFLAGS="-lgui -lgfx -lipc -lcore -lm" } @@ -19,7 +19,7 @@ build() { } install() { - run make -k DESTDIR="${SERENITY_BUILD_DIR}/Root" install - ${CC} -shared -o $DESTDIR/usr/local/lib/libSDL2_image.so -Wl,--whole-archive $DESTDIR/usr/local/lib/libSDL2_image.a -Wl,--no-whole-archive -lpng -ljpeg -ltiff - rm -f $DESTDIR/usr/local/lib/libSDL2_image.la + run make -k DESTDIR="${SERENITY_INSTALL_ROOT}" install + ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libSDL2_image.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libSDL2_image.a -Wl,--no-whole-archive -lpng -ljpeg -ltiff + rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libSDL2_image.la } diff --git a/Ports/SDL2_mixer/package.sh b/Ports/SDL2_mixer/package.sh index 4eb2ec54de..f8666cb83a 100755 --- a/Ports/SDL2_mixer/package.sh +++ b/Ports/SDL2_mixer/package.sh @@ -9,7 +9,7 @@ depends="SDL2 libvorbis" configure() { run ./configure \ --host="${SERENITY_ARCH}-pc-serenity" \ - --with-sdl-prefix="${SERENITY_BUILD_DIR}/Root/usr/local" \ + --with-sdl-prefix="${SERENITY_INSTALL_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" @@ -20,7 +20,7 @@ build() { } install() { - run make -k DESTDIR="${SERENITY_BUILD_DIR}/Root" install - ${CC} -shared -o $DESTDIR/usr/local/lib/libSDL2_mixer.so -Wl,--whole-archive $DESTDIR/usr/local/lib/libSDL2_mixer.a -Wl,--no-whole-archive -Wl,--no-as-needed -lvorbis -lvorbisfile - rm -f $DESTDIR/usr/local/lib/libSDL2_mixer.la + run make -k DESTDIR="${SERENITY_INSTALL_ROOT}" install + ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libSDL2_mixer.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libSDL2_mixer.a -Wl,--no-whole-archive -Wl,--no-as-needed -lvorbis -lvorbisfile + rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libSDL2_mixer.la } diff --git a/Ports/SDL2_ttf/package.sh b/Ports/SDL2_ttf/package.sh index 44163987d3..d6d855fb08 100755 --- a/Ports/SDL2_ttf/package.sh +++ b/Ports/SDL2_ttf/package.sh @@ -9,13 +9,13 @@ depends="SDL2 freetype" configure() { run ./configure \ --host="${SERENITY_ARCH}-pc-serenity" \ - --with-sdl-prefix="${SERENITY_BUILD_DIR}/Root/usr/local" \ + --with-sdl-prefix="${SERENITY_INSTALL_ROOT}/usr/local" \ --with-x=no \ - FT2_CFLAGS="-I${SERENITY_BUILD_DIR}/Root/usr/local/include/freetype2" \ + FT2_CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/local/include/freetype2" \ LIBS="-lgui -lgfx -lipc -lcore -lcompress" } install() { - run make install DESTDIR=$DESTDIR $installopts - run ${CC} -shared -o $DESTDIR/usr/local/lib/libSDL2_ttf.so -Wl,--whole-archive $DESTDIR/usr/local/lib/libSDL2_ttf.a -Wl,--no-whole-archive + run make install DESTDIR=${SERENITY_INSTALL_ROOT} $installopts + run ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libSDL2_ttf.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libSDL2_ttf.a -Wl,--no-whole-archive } diff --git a/Ports/SDLPoP/package.sh b/Ports/SDLPoP/package.sh index 0cdee7f07a..0280450782 100755 --- a/Ports/SDLPoP/package.sh +++ b/Ports/SDLPoP/package.sh @@ -7,13 +7,12 @@ workdir=SDLPoP-86988c668eeaa10f218e1d4938fc5b4e42314d68 configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_SOURCE_DIR/Toolchain/CMake/CMakeToolchain.txt" files="https://github.com/NagyD/SDLPoP/archive/86988c668eeaa10f218e1d4938fc5b4e42314d68.zip PoP.zip d18cae8541fb8cbcc374fd998316993d561429a83f92061bc0754337ada774c5" auth_type=sha256 -install_location="Root/opt/PrinceOfPersia" configure() { run cmake $configopts ./src } install() { - mkdir -p "${SERENITY_BUILD_DIR}/${install_location}" - run cp -r prince data SDLPoP.ini "${SERENITY_BUILD_DIR}/${install_location}" + mkdir -p "${SERENITY_INSTALL_ROOT}/opt/PrinceOfPersia" + run cp -r prince data SDLPoP.ini "${SERENITY_INSTALL_ROOT}/opt/PrinceOfPersia" } diff --git a/Ports/Super-Mario/package.sh b/Ports/Super-Mario/package.sh index 480f96ba6b..6a2808a224 100755 --- a/Ports/Super-Mario/package.sh +++ b/Ports/Super-Mario/package.sh @@ -7,13 +7,12 @@ workdir=Super-Mario-Clone-Cpp-master configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_SOURCE_DIR/Toolchain/CMake/CMakeToolchain.txt" files="https://github.com/Bennyhwanggggg/Super-Mario-Clone-Cpp/archive/refs/heads/master.zip master.zip 11f622721d1ba504acf75c024aa0dbe3" auth_type=md5 -install_location="Root/opt/Super_Mario" configure() { run cmake $configopts } install() { - run mkdir -p "${SERENITY_BUILD_DIR}/${install_location}" - run cp -r uMario app.ico icon2.ico files "${SERENITY_BUILD_DIR}/${install_location}" + run mkdir -p "${SERENITY_INSTALL_ROOT}/opt/Super_Mario" + run cp -r uMario app.ico icon2.ico files "${SERENITY_INSTALL_ROOT}/opt/Super_Mario" } diff --git a/Ports/bash/package.sh b/Ports/bash/package.sh index 171b6928e4..039fb31c4b 100755 --- a/Ports/bash/package.sh +++ b/Ports/bash/package.sh @@ -16,6 +16,6 @@ build() { } post_install() { - mkdir -p "${SERENITY_BUILD_DIR}/Root/bin" - ln -sf /usr/local/bin/bash "${SERENITY_BUILD_DIR}/Root/bin/bash" + mkdir -p "${SERENITY_INSTALL_ROOT}/bin" + ln -sf /usr/local/bin/bash "${SERENITY_INSTALL_ROOT}/bin/bash" } diff --git a/Ports/binutils/package.sh b/Ports/binutils/package.sh index a93c95ce42..8c0b991d7d 100755 --- a/Ports/binutils/package.sh +++ b/Ports/binutils/package.sh @@ -2,7 +2,7 @@ port=binutils version=2.32 useconfigure=true -configopts="--target=${SERENITY_ARCH}-pc-serenity --with-sysroot=/ --with-build-sysroot=${SERENITY_BUILD_DIR}/Root --disable-werror --disable-gdb --disable-nls" +configopts="--target=${SERENITY_ARCH}-pc-serenity --with-sysroot=/ --with-build-sysroot=${SERENITY_INSTALL_ROOT} --disable-werror --disable-gdb --disable-nls" files="https://ftpmirror.gnu.org/gnu/binutils/binutils-${version}.tar.xz binutils-${version}.tar.xz https://ftpmirror.gnu.org/gnu/binutils/binutils-${version}.tar.xz.sig binutils-${version}.tar.xz.sig https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg" diff --git a/Ports/bison/package.sh b/Ports/bison/package.sh index 4f8b1b5472..2509b21e05 100755 --- a/Ports/bison/package.sh +++ b/Ports/bison/package.sh @@ -2,6 +2,6 @@ port=bison version=1.25 useconfigure=true -configopts="--prefix=${SERENITY_BUILD_DIR}/Root/usr/local" +configopts="--prefix=${SERENITY_INSTALL_ROOT}/usr/local" files="https://ftpmirror.gnu.org/gnu/bison/bison-${version}.tar.gz bison-${version}.tar.gz 65f577d0f8ffaf61ae21c23c0918d225" auth_type="md5" diff --git a/Ports/bzip2/package.sh b/Ports/bzip2/package.sh index 2766d137fb..eefb5548e1 100755 --- a/Ports/bzip2/package.sh +++ b/Ports/bzip2/package.sh @@ -4,12 +4,12 @@ version=1.0.8 files="https://sourceware.org/pub/bzip2/bzip2-${version}.tar.gz bzip2-${version}.tar.gz 67e051268d0c475ea773822f7500d0e5" auth_type=md5 makeopts=bzip2 -installopts="PREFIX=${SERENITY_BUILD_DIR}/Root/usr/local" +installopts="PREFIX=${SERENITY_INSTALL_ROOT}/usr/local" build() { run make CC="${CC}" $makeopts bzip2 } install() { - run make DESTDIR=$DESTDIR CC="${CC}" $installopts install + run make DESTDIR=${SERENITY_INSTALL_ROOT} CC="${CC}" $installopts install } diff --git a/Ports/c-ray/package.sh b/Ports/c-ray/package.sh index 7a93152bea..2ad4efb816 100755 --- a/Ports/c-ray/package.sh +++ b/Ports/c-ray/package.sh @@ -13,6 +13,6 @@ configure() { } install() { - mkdir -p "${SERENITY_BUILD_DIR}/Root/home/anon/c-ray" - cp -r "${port}-${version}"/* "${SERENITY_BUILD_DIR}/Root/home/anon/c-ray" + mkdir -p "${SERENITY_INSTALL_ROOT}/home/anon/c-ray" + cp -r "${port}-${version}"/* "${SERENITY_INSTALL_ROOT}/home/anon/c-ray" } diff --git a/Ports/carl/package.sh b/Ports/carl/package.sh index 32c6b0d598..2bbb4e9804 100755 --- a/Ports/carl/package.sh +++ b/Ports/carl/package.sh @@ -10,6 +10,6 @@ build() { } install() { - run mkdir -p "${SERENITY_BUILD_DIR}/Root/usr/local" - run cp carl "${SERENITY_BUILD_DIR}/Root/usr/local/bin" + run mkdir -p "${SERENITY_INSTALL_ROOT}/usr/local" + run cp carl "${SERENITY_INSTALL_ROOT}/usr/local/bin" } diff --git a/Ports/chester/package.sh b/Ports/chester/package.sh index c61e5502db..f6e0f89bf2 100755 --- a/Ports/chester/package.sh +++ b/Ports/chester/package.sh @@ -4,7 +4,7 @@ useconfigure=true version=git depends="SDL2" workdir=chester-public -configopts="-DCMAKE_TOOLCHAIN_FILE=$SERENITY_SOURCE_DIR/Toolchain/CMake/CMakeToolchain.txt" +configopts="-DCMAKE_TOOLCHAIN_FILE=${SERENITY_SOURCE_DIR}/Toolchain/CMake/CMakeToolchain.txt" files="https://github.com/veikkos/chester/archive/public.tar.gz chester.tar.gz f09d797209e7bfd9b1460d2540525186" auth_type=md5 @@ -13,5 +13,5 @@ configure() { } install() { - run cp bin/chester "${SERENITY_BUILD_DIR}/Root/bin" + run cp bin/chester "${SERENITY_INSTALL_ROOT}/bin" } diff --git a/Ports/cmatrix/package.sh b/Ports/cmatrix/package.sh index 46def566f3..2db524c9b1 100755 --- a/Ports/cmatrix/package.sh +++ b/Ports/cmatrix/package.sh @@ -13,5 +13,5 @@ configure() { } install() { - run cp cmatrix "${SERENITY_BUILD_DIR}/Root/bin" + run cp cmatrix "${SERENITY_INSTALL_ROOT}/bin" } diff --git a/Ports/cmatrix/patches/fix_cmakelists.patch b/Ports/cmatrix/patches/fix_cmakelists.patch index aaa5f9411c..94c2a63eb0 100644 --- a/Ports/cmatrix/patches/fix_cmakelists.patch +++ b/Ports/cmatrix/patches/fix_cmakelists.patch @@ -6,8 +6,8 @@ index a808a98..7b8753a 100644 project(CMatrix LANGUAGES C) set(VERSION "2.0") -+set(CMAKE_INCLUDE_PATH "${SERENITY_BUILD_DIR}/Root/usr/local/include/ncurses") -+set(CURSES_NCURSES_LIBRARY "${SERENITY_BUILD_DIR}/Root/usr/local/lib/libncurses.a") ++set(CMAKE_INCLUDE_PATH "${SERENITY_INSTALL_ROOT}/usr/local/include/ncurses") ++set(CURSES_NCURSES_LIBRARY "${SERENITY_INSTALL_ROOT}/usr/local/lib/libncurses.a") + # These are relative to CMAKE_INSTALL_PREFIX # which by default is "/usr/local" diff --git a/Ports/dash/package.sh b/Ports/dash/package.sh index 614f7db1ee..740d05b858 100755 --- a/Ports/dash/package.sh +++ b/Ports/dash/package.sh @@ -28,5 +28,5 @@ build() { } install() { - run sh -c "cd target-build && make DESTDIR="${SERENITY_BUILD_DIR}/Root" $installopts install" + run sh -c "cd target-build && make DESTDIR="${SERENITY_INSTALL_ROOT}" $installopts install" } diff --git a/Ports/dialog/package.sh b/Ports/dialog/package.sh index d2c82df23a..a206183904 100755 --- a/Ports/dialog/package.sh +++ b/Ports/dialog/package.sh @@ -8,4 +8,4 @@ auth_type="sig" auth_import_key="C52048C0C0748FEE227D47A2702353E0F7E48EDB" auth_opts="dialog-${version}.tgz.asc dialog-${version}.tgz" useconfigure=true -configopts="--prefix=/usr/local --with-ncurses --with-curses-dir=${SERENITY_SOURCE_DIR}/Build/i686/Root/usr/local/include/ncurses" +configopts="--prefix=/usr/local --with-ncurses --with-curses-dir=${SERENITY_INSTALL_ROOT}/usr/local/include/ncurses" diff --git a/Ports/dmidecode/package.sh b/Ports/dmidecode/package.sh index d92e4037cb..257fd5feb8 100755 --- a/Ports/dmidecode/package.sh +++ b/Ports/dmidecode/package.sh @@ -15,9 +15,9 @@ install() { } post_install() { - mkdir -p "${SERENITY_BUILD_DIR}/Root/bin" - run make install-bin DESTDIR="${SERENITY_BUILD_DIR}/Root" - ln -sf /usr/local/sbin/dmidecode "${SERENITY_BUILD_DIR}/Root/bin/dmidecode" - ln -sf /usr/local/sbin/biosdecode "${SERENITY_BUILD_DIR}/Root/bin/biosdecode" - ln -sf /usr/local/sbin/vpddecode "${SERENITY_BUILD_DIR}/Root/bin/vpddecode" + mkdir -p "${SERENITY_INSTALL_ROOT}/bin" + run make install-bin DESTDIR="${SERENITY_INSTALL_ROOT}" + ln -sf /usr/local/sbin/dmidecode "${SERENITY_INSTALL_ROOT}/bin/dmidecode" + ln -sf /usr/local/sbin/biosdecode "${SERENITY_INSTALL_ROOT}/bin/biosdecode" + ln -sf /usr/local/sbin/vpddecode "${SERENITY_INSTALL_ROOT}/bin/vpddecode" } diff --git a/Ports/emu2/package.sh b/Ports/emu2/package.sh index e63c42beee..8afd392075 100755 --- a/Ports/emu2/package.sh +++ b/Ports/emu2/package.sh @@ -6,5 +6,5 @@ auth_type=md5 build() { export CC="${SERENITY_SOURCE_DIR}/Toolchain/Local/${SERENITY_ARCH}/bin/${SERENITY_ARCH}-pc-serenity-gcc" - run make DESTDIR="${SERENITY_BUILD_DIR}/Root" CC="${CC}" $installopts + run make DESTDIR="${SERENITY_INSTALL_ROOT}" CC="${CC}" $installopts } diff --git a/Ports/frotz/package.sh b/Ports/frotz/package.sh index 6229c3d007..14ad06ad4b 100755 --- a/Ports/frotz/package.sh +++ b/Ports/frotz/package.sh @@ -9,7 +9,7 @@ depends="ncurses" build() { run make \ PKG_CONFIG_CURSES=no \ - CURSES_CFLAGS="-I${SERENITY_SOURCE_DIR}/Build/i686/Root/usr/local/include/ncurses" \ + CURSES_CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/local/include/ncurses" \ CURSES_LDFLAGS="-lncurses -ltinfo" \ CURSES=ncurses \ USE_UTF8=no \ diff --git a/Ports/gcc/package.sh b/Ports/gcc/package.sh index 1b29378689..1cd8133d0a 100755 --- a/Ports/gcc/package.sh +++ b/Ports/gcc/package.sh @@ -2,12 +2,12 @@ port=gcc version=10.3.0 useconfigure=true -configopts="--target=${SERENITY_ARCH}-pc-serenity --with-sysroot=/ --with-build-sysroot=${SERENITY_BUILD_DIR}/Root --with-newlib --enable-languages=c,c++ --disable-lto --disable-nls --enable-shared --enable-default-pie --enable-host-shared" +configopts="--target=${SERENITY_ARCH}-pc-serenity --with-sysroot=/ --with-build-sysroot=${SERENITY_INSTALL_ROOT} --with-newlib --enable-languages=c,c++ --disable-lto --disable-nls --enable-shared --enable-default-pie --enable-host-shared" files="https://ftpmirror.gnu.org/gnu/gcc/gcc-${version}/gcc-${version}.tar.xz gcc-${version}.tar.xz https://ftpmirror.gnu.org/gnu/gcc/gcc-${version}/gcc-${version}.tar.xz.sig gcc-${version}.tar.xz.sig https://ftpmirror.gnu.org/gnu/gnu-keyring.gpg gnu-keyring.gpg" makeopts="all-gcc all-target-libgcc all-target-libstdc++-v3 -j $(nproc)" -installopts="DESTDIR=${SERENITY_BUILD_DIR}/Root install-gcc install-target-libgcc install-target-libstdc++-v3" +installopts="DESTDIR=${SERENITY_INSTALL_ROOT} install-gcc install-target-libgcc install-target-libstdc++-v3" depends="binutils" auth_type="sig" auth_opts="--keyring ./gnu-keyring.gpg gcc-${version}.tar.xz.sig" diff --git a/Ports/git/package.sh b/Ports/git/package.sh index b344578afe..0648bda71e 100755 --- a/Ports/git/package.sh +++ b/Ports/git/package.sh @@ -13,8 +13,8 @@ build() { } post_install() { - run mkdir -p "${SERENITY_BUILD_DIR}/Root/home/anon" - run cp "../default_gitconfig" "${SERENITY_BUILD_DIR}/Root/home/anon/.gitconfig" + run mkdir -p "${SERENITY_INSTALL_ROOT}/home/anon" + run cp "../default_gitconfig" "${SERENITY_INSTALL_ROOT}/home/anon/.gitconfig" } export NO_OPENSSL=1 diff --git a/Ports/gnupg/package.sh b/Ports/gnupg/package.sh index 120e0bcac6..410700531e 100755 --- a/Ports/gnupg/package.sh +++ b/Ports/gnupg/package.sh @@ -2,20 +2,20 @@ port=gnupg version=2.3.0 useconfigure=true -configopts="--with-libgpg-error-prefix=${SERENITY_BUILD_DIR}/Root/usr/local \ - --with-libgcrypt-prefix=${SERENITY_BUILD_DIR}/Root/usr/local \ - --with-libassuan-prefix=${SERENITY_BUILD_DIR}/Root/usr/local \ - --with-ntbtls-prefix=${SERENITY_BUILD_DIR}/Root/usr/local \ - --with-npth-prefix=${SERENITY_BUILD_DIR}/Root/usr/local \ +configopts="--with-libgpg-error-prefix=${SERENITY_INSTALL_ROOT}/usr/local \ + --with-libgcrypt-prefix=${SERENITY_INSTALL_ROOT}/usr/local \ + --with-libassuan-prefix=${SERENITY_INSTALL_ROOT}/usr/local \ + --with-ntbtls-prefix=${SERENITY_INSTALL_ROOT}/usr/local \ + --with-npth-prefix=${SERENITY_INSTALL_ROOT}/usr/local \ --disable-dirmngr" files="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-${version}.tar.bz2 gnupg-${version}.tar.bz2 84c1ef39e8621cfb70f31463a5d1d8edeab44332bc1e0e1af9b78b6f9ed05bb4" auth_type=sha256 depends="libiconv libgpg-error libgcrypt libksba libassuan npth ntbtls" pre_configure() { - export GPGRT_CONFIG="${SERENITY_BUILD_DIR}/Root/usr/local/bin/gpgrt-config" - export CFLAGS="-L${SERENITY_BUILD_DIR}/Root/usr/local/include" - export LDFLAGS="-L${SERENITY_BUILD_DIR}/Root/usr/local/lib -lm -liconv" + export GPGRT_CONFIG="${SERENITY_INSTALL_ROOT}/usr/local/bin/gpgrt-config" + export CFLAGS="-L${SERENITY_INSTALL_ROOT}/usr/local/include" + export LDFLAGS="-L${SERENITY_INSTALL_ROOT}/usr/local/lib -lm -liconv" } configure() { diff --git a/Ports/gnuplot/package.sh b/Ports/gnuplot/package.sh index de036cdfd7..5cacb88ff8 100755 --- a/Ports/gnuplot/package.sh +++ b/Ports/gnuplot/package.sh @@ -5,7 +5,7 @@ useconfigure=true # Note: gnuplot's source code is hosted on SourceForge, but using the GitHub mirror makes downloading a versioned .tar.gz easier. files="https://github.com/gnuplot/gnuplot/archive/${version}.tar.gz gnuplot-${version}.tar.gz 292f983e273cd50cf02e0737043fae0e" auth_type=md5 -configopts="--prefix=${SERENITY_BUILD_DIR}/Root/usr/local --with-readline=builtin --without-latex" +configopts="--prefix=${SERENITY_INSTALL_ROOT}/usr/local --with-readline=builtin --without-latex" pre_configure() { run ./prepare diff --git a/Ports/indent/package.sh b/Ports/indent/package.sh index 4f8253f832..90549265ad 100755 --- a/Ports/indent/package.sh +++ b/Ports/indent/package.sh @@ -9,7 +9,7 @@ auth_type="sig" auth_opts="--keyring ./gnu-keyring.gpg indent-${version}.tar.gz.sig" post_install() { - man_dir="${SERENITY_BUILD_DIR}/Root/usr/local/share/man/man1/" + man_dir="${SERENITY_INSTALL_ROOT}/usr/local/share/man/man1/" run mkdir -p "${man_dir}" run cp man/indent.1 "${man_dir}" } diff --git a/Ports/libassuan/package.sh b/Ports/libassuan/package.sh index 40d0f9cf45..46f73e1b16 100755 --- a/Ports/libassuan/package.sh +++ b/Ports/libassuan/package.sh @@ -2,7 +2,7 @@ port=libassuan version=2.5.5 useconfigure=true -#configopts="--with-libgpg-error-prefix=${SERENITY_BUILD_DIR}/Root/usr/local" +#configopts="--with-libgpg-error-prefix=${SERENITY_INSTALL_ROOT}/usr/local" files="https://gnupg.org/ftp/gcrypt/libassuan/libassuan-${version}.tar.bz2 libassuan-${version}.tar.bz2 7194453152bb67e3d45da698762b5d6f" auth_type=md5 diff --git a/Ports/libgcrypt/package.sh b/Ports/libgcrypt/package.sh index b0d13b7066..bab291dc64 100755 --- a/Ports/libgcrypt/package.sh +++ b/Ports/libgcrypt/package.sh @@ -2,7 +2,7 @@ port=libgcrypt version=1.9.2 useconfigure=true -configopts="--with-libgpg-error-prefix=${SERENITY_BUILD_DIR}/Root/usr/local" +configopts="--with-libgpg-error-prefix=${SERENITY_INSTALL_ROOT}/usr/local" files="https://gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-${version}.tar.bz2 libgcrypt-${version}.tar.bz2 00121b05e1ff4cc85a4a6503e0a7d9fb" auth_type=md5 diff --git a/Ports/libiconv/package.sh b/Ports/libiconv/package.sh index b9fb916453..cf52c41be0 100755 --- a/Ports/libiconv/package.sh +++ b/Ports/libiconv/package.sh @@ -11,6 +11,6 @@ auth_type="sig" auth_opts="--keyring ./gnu-keyring.gpg libiconv-${version}.tar.gz.sig" install() { - run make DESTDIR=$DESTDIR $installopts install - run ${SERENITY_ARCH}-pc-serenity-gcc -shared -o $DESTDIR/usr/local/lib/libiconv.so -Wl,--whole-archive $DESTDIR/usr/local/lib/libiconv.a -Wl,--no-whole-archive + run make DESTDIR=${SERENITY_INSTALL_ROOT} $installopts install + run ${SERENITY_ARCH}-pc-serenity-gcc -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libiconv.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libiconv.a -Wl,--no-whole-archive } diff --git a/Ports/libjpeg/package.sh b/Ports/libjpeg/package.sh index 898549fe6c..fd17c70dd8 100755 --- a/Ports/libjpeg/package.sh +++ b/Ports/libjpeg/package.sh @@ -7,7 +7,7 @@ auth_type="md5" workdir="jpeg-$version" install() { - run make DESTDIR=$DESTDIR $installopts install - ${CC} -shared -o $DESTDIR/usr/local/lib/libjpeg.so -Wl,--whole-archive $DESTDIR/usr/local/lib/libjpeg.a -Wl,--no-whole-archive - rm -f $DESTDIR/usr/local/lib/libjpeg.la + run make DESTDIR=${SERENITY_INSTALL_ROOT} $installopts install + ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libjpeg.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libjpeg.a -Wl,--no-whole-archive + rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libjpeg.la } diff --git a/Ports/libogg/package.sh b/Ports/libogg/package.sh index 439e3bc608..f5147049b6 100755 --- a/Ports/libogg/package.sh +++ b/Ports/libogg/package.sh @@ -6,7 +6,7 @@ files="https://github.com/xiph/ogg/releases/download/v${version}/libogg-${versio auth_type=md5 install() { - run make DESTDIR=$DESTDIR $installopts install - ${CC} -shared -o $DESTDIR/usr/local/lib/libogg.so -Wl,--whole-archive $DESTDIR/usr/local/lib/libogg.a -Wl,--no-whole-archive - rm -f $DESTDIR/usr/local/lib/libogg.la + run make DESTDIR=${SERENITY_INSTALL_ROOT} $installopts install + ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libogg.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libogg.a -Wl,--no-whole-archive + rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libogg.la } diff --git a/Ports/libpng/package.sh b/Ports/libpng/package.sh index 584f2b81ae..c5b669ffe8 100755 --- a/Ports/libpng/package.sh +++ b/Ports/libpng/package.sh @@ -7,8 +7,8 @@ auth_type=md5 depends="zlib" install() { - run make DESTDIR=$DESTDIR $installopts install - ${CC} -shared -o $DESTDIR/usr/local/lib/libpng16.so -Wl,--whole-archive $DESTDIR/usr/local/lib/libpng16.a -Wl,--no-whole-archive -lz - ln -sf libpng16.so $DESTDIR/usr/local/lib/libpng.so - rm -f $DESTDIR/usr/local/lib/libpng16.la $DESTDIR/usr/local/lib/libpng.la + run make DESTDIR=${SERENITY_INSTALL_ROOT} $installopts install + ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libpng16.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libpng16.a -Wl,--no-whole-archive -lz + ln -sf libpng16.so ${SERENITY_INSTALL_ROOT}/usr/local/lib/libpng.so + rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libpng16.la ${SERENITY_INSTALL_ROOT}/usr/local/lib/libpng.la } diff --git a/Ports/libtiff/package.sh b/Ports/libtiff/package.sh index 99473f7a20..bf802063c2 100755 --- a/Ports/libtiff/package.sh +++ b/Ports/libtiff/package.sh @@ -10,8 +10,8 @@ auth_opts="tiff-${version}.tar.gz.sig tiff-${version}.tar.gz" depends="zstd xz" install() { - run make DESTDIR=$DESTDIR $installopts install - ${CC} -shared -o $DESTDIR/usr/local/lib/libtiff.so -Wl,--whole-archive $DESTDIR/usr/local/lib/libtiff.a -Wl,--no-whole-archive -lzstd -llzma - ${CC} -shared -o $DESTDIR/usr/local/lib/libtiffxx.so -Wl,--whole-archive $DESTDIR/usr/local/lib/libtiffxx.a -Wl,--no-whole-archive -lzstd -llzma - rm -f $DESTDIR/usr/local/lib/libtiff.la $DESTDIR/usr/local/lib/libtiffxx.la + run make DESTDIR=${SERENITY_INSTALL_ROOT} $installopts install + ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libtiff.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libtiff.a -Wl,--no-whole-archive -lzstd -llzma + ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libtiffxx.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libtiffxx.a -Wl,--no-whole-archive -lzstd -llzma + rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libtiff.la ${SERENITY_INSTALL_ROOT}/usr/local/lib/libtiffxx.la } diff --git a/Ports/libtool/package.sh b/Ports/libtool/package.sh index c84f9f4511..233917b72c 100755 --- a/Ports/libtool/package.sh +++ b/Ports/libtool/package.sh @@ -11,6 +11,6 @@ auth_opts="--keyring ./gnu-keyring.gpg libtool-${version}.tar.xz.sig" configopts="--prefix=/usr/local" post_install() { - mkdir -p "${SERENITY_BUILD_DIR}/Root/usr/bin" - ln -sf /usr/local/bin/sed "${SERENITY_BUILD_DIR}/Root/usr/bin/sed" + mkdir -p "${SERENITY_INSTALL_ROOT}/usr/bin" + ln -sf /usr/local/bin/sed "${SERENITY_INSTALL_ROOT}/usr/bin/sed" } diff --git a/Ports/libvorbis/package.sh b/Ports/libvorbis/package.sh index 2f1917d707..37511b308c 100755 --- a/Ports/libvorbis/package.sh +++ b/Ports/libvorbis/package.sh @@ -7,11 +7,11 @@ auth_type=md5 depends=libogg install() { - run make DESTDIR=$DESTDIR $installopts install - ${CC} -shared -o $DESTDIR/usr/local/lib/libvorbis.so -Wl,--whole-archive $DESTDIR/usr/local/lib/libvorbis.a -Wl,--no-whole-archive -logg - rm -f $DESTDIR/usr/local/lib/libvorbis.la - ${CC} -shared -o $DESTDIR/usr/local/lib/libvorbisenc.so -Wl,--whole-archive $DESTDIR/usr/local/lib/libvorbisenc.a -Wl,--no-whole-archive -lvorbis - rm -f $DESTDIR/usr/local/lib/libvorbisenc.la - ${CC} -shared -o $DESTDIR/usr/local/lib/libvorbisfile.so -Wl,--whole-archive $DESTDIR/usr/local/lib/libvorbisfile.a -Wl,--no-whole-archive -lvorbis - rm -f $DESTDIR/usr/local/lib/libvorbisfile.la + run make DESTDIR=${SERENITY_INSTALL_ROOT} $installopts install + ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libvorbis.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libvorbis.a -Wl,--no-whole-archive -logg + rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libvorbis.la + ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libvorbisenc.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libvorbisenc.a -Wl,--no-whole-archive -lvorbis + rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libvorbisenc.la + ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libvorbisfile.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libvorbisfile.a -Wl,--no-whole-archive -lvorbis + rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libvorbisfile.la } diff --git a/Ports/libzip/patches/disable_unnecessary_options.patch b/Ports/libzip/patches/disable_unnecessary_options.patch index 64d2c8e9e8..49f1b3f415 100644 --- a/Ports/libzip/patches/disable_unnecessary_options.patch +++ b/Ports/libzip/patches/disable_unnecessary_options.patch @@ -11,8 +11,8 @@ index 017f7cf0..125900e2 100644 -option(ENABLE_MBEDTLS "Enable use of mbed TLS" ON) -option(ENABLE_OPENSSL "Enable use of OpenSSL" ON) -option(ENABLE_WINDOWS_CRYPTO "Enable use of Windows cryptography libraries" ON) -+set(ZLIB_LIBRARY ${SERENITY_BUILD_DIR}/Root/usr/local/lib/libz.a) -+set(ZLIB_INCLUDE_DIR ${SERENITY_BUILD_DIR}/Root/usr/local/include/zlib.h) ++set(ZLIB_LIBRARY ${SERENITY_INSTALL_ROOT}/usr/local/lib/libz.a) ++set(ZLIB_INCLUDE_DIR ${SERENITY_INSTALL_ROOT}/usr/local/include/zlib.h) +add_compile_definitions(HAVE_STRINGS_H) -option(ENABLE_BZIP2 "Enable use of BZip2" ON) diff --git a/Ports/lua/package.sh b/Ports/lua/package.sh index e9c81221dd..27d734cffd 100755 --- a/Ports/lua/package.sh +++ b/Ports/lua/package.sh @@ -4,4 +4,4 @@ version=5.3.5 files="http://www.lua.org/ftp/lua-${version}.tar.gz lua-${version}.tar.gz 4f4b4f323fd3514a68e0ab3da8ce3455" auth_type=md5 makeopts="-j$(nproc) serenity" -installopts="INSTALL_TOP=${SERENITY_BUILD_DIR}/Root/usr/local" +installopts="INSTALL_TOP=${SERENITY_INSTALL_ROOT}/usr/local" diff --git a/Ports/nano/package.sh b/Ports/nano/package.sh index c7782ccdc9..42f6f4b096 100755 --- a/Ports/nano/package.sh +++ b/Ports/nano/package.sh @@ -10,5 +10,5 @@ auth_type="sig" auth_import_key="BFD009061E535052AD0DF2150D28D4D2A0ACE884" auth_opts="nano-${version}.tar.xz.asc nano-${version}.tar.xz" -export CPPFLAGS="-I${SERENITY_BUILD_DIR}/Root/usr/local/include/ncurses" -export PKG_CONFIG_PATH="${SERENITY_BUILD_DIR}/Root/usr/local/lib/pkgconfig" +export CPPFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/local/include/ncurses" +export PKG_CONFIG_PATH="${SERENITY_INSTALL_ROOT}/usr/local/lib/pkgconfig" diff --git a/Ports/neofetch/package.sh b/Ports/neofetch/package.sh index f2147c0da1..c2be427d19 100755 --- a/Ports/neofetch/package.sh +++ b/Ports/neofetch/package.sh @@ -8,5 +8,5 @@ files="https://github.com/dylanaraps/neofetch/archive/${version}.tar.gz neofetch auth_type=md5 install() { - run make DESTDIR=$DESTDIR PREFIX=/usr/local $installopts install + run make DESTDIR=${SERENITY_INSTALL_ROOT} PREFIX=/usr/local $installopts install } diff --git a/Ports/nesalizer/package.sh b/Ports/nesalizer/package.sh index 71a601abb8..e3a9207f04 100755 --- a/Ports/nesalizer/package.sh +++ b/Ports/nesalizer/package.sh @@ -1,6 +1,6 @@ #!/usr/bin/env -S bash ../.port_include.sh port=nesalizer version=master -makeopts="CONF=release EXTRA=-I${SERENITY_SOURCE_DIR}/Build/i686/Root/usr/local/include/SDL2" +makeopts="CONF=release EXTRA=-I${SERENITY_INSTALL_ROOT}/usr/local/include/SDL2" files="https://github.com/SerenityOS/nesalizer/archive/master.zip nesalizer-master.zip" depends=SDL2 diff --git a/Ports/ninja/package.sh b/Ports/ninja/package.sh index 34d8b84424..10be8a4d4a 100755 --- a/Ports/ninja/package.sh +++ b/Ports/ninja/package.sh @@ -5,14 +5,14 @@ files="https://github.com/ninja-build/ninja/archive/v${version}.tar.gz ninja-v${ auth_type=md5 build() { - CXXFLAGS="--sysroot=${SERENITY_BUILD_DIR}/Root" \ - LDFLAGS="--sysroot=${SERENITY_BUILD_DIR}/Root" \ + CXXFLAGS="--sysroot=${SERENITY_INSTALL_ROOT}" \ + LDFLAGS="--sysroot=${SERENITY_INSTALL_ROOT}" \ # platform=linux is close enough. run ./configure.py --bootstrap --platform=linux run strip ninja } install() { - run mkdir -p "${SERENITY_BUILD_DIR}/Root/usr/local/bin" - run cp ninja "${SERENITY_BUILD_DIR}/Root/usr/local/bin/ninja" + run mkdir -p "${SERENITY_INSTALL_ROOT}/usr/local/bin" + run cp ninja "${SERENITY_INSTALL_ROOT}/usr/local/bin/ninja" } diff --git a/Ports/ntbtls/package.sh b/Ports/ntbtls/package.sh index 3b966b0a03..a64ef6e3bd 100755 --- a/Ports/ntbtls/package.sh +++ b/Ports/ntbtls/package.sh @@ -2,7 +2,7 @@ port=ntbtls version=0.2.0 useconfigure=true -#configopts="--with-libgpg-error-prefix=${SERENITY_BUILD_DIR}/Root/usr/local" +#configopts="--with-libgpg-error-prefix=${SERENITY_INSTALL_ROOT}/usr/local" files="https://gnupg.org/ftp/gcrypt/ntbtls/ntbtls-${version}.tar.bz2 ntbtls-${version}.tar.bz2 efe1b12502df319bf78707a2fa767098" auth_type=md5 diff --git a/Ports/oksh/package.sh b/Ports/oksh/package.sh index 5301acaa08..80b1533721 100755 --- a/Ports/oksh/package.sh +++ b/Ports/oksh/package.sh @@ -15,5 +15,5 @@ configure() { } install() { - run cp oksh "${SERENITY_BUILD_DIR}/Root/bin" + run cp oksh "${SERENITY_INSTALL_ROOT}/bin" } diff --git a/Ports/openssh/package.sh b/Ports/openssh/package.sh index 3c752b6789..ecf5885c4a 100755 --- a/Ports/openssh/package.sh +++ b/Ports/openssh/package.sh @@ -6,7 +6,7 @@ files="https://github.com/openssh/openssh-portable/archive/9ca7e9c861775dd6c6312 auth_type=md5 depends="zlib openssl" useconfigure=true -configopts="--prefix=/usr/local --disable-utmp --sysconfdir=/etc/ssh --with-ssl-dir=${SERENITY_BUILD_DIR}/Root/usr/local/lib" +configopts="--prefix=/usr/local --disable-utmp --sysconfdir=/etc/ssh --with-ssl-dir=${SERENITY_INSTALL_ROOT}/usr/local/lib" pre_configure() { run autoreconf @@ -14,5 +14,5 @@ pre_configure() { install() { # Can't make keys outside of Serenity since ssh-keygen is built for Serenity. - run make DESTDIR="${SERENITY_BUILD_DIR}/Root" $installopts install-nokeys + run make DESTDIR="${SERENITY_INSTALL_ROOT}" $installopts install-nokeys } diff --git a/Ports/openssl/package.sh b/Ports/openssl/package.sh index d7350ab08c..f0e5d17071 100755 --- a/Ports/openssl/package.sh +++ b/Ports/openssl/package.sh @@ -11,7 +11,7 @@ auth_import_key="8657ABB260F056B1E5190839D9C4D26D0E604491" auth_opts="openssl-${version}.tar.gz.asc openssl-${version}.tar.gz" depends="zlib" -configopts="--prefix=${SERENITY_BUILD_DIR}/Root/usr/local -DOPENSSL_SYS_SERENITY=1 --openssldir=${SERENITY_BUILD_DIR}/Root/usr/local/ssl BSD-x86 zlib no-tests no-threads no-asm" +configopts="--prefix=${SERENITY_INSTALL_ROOT}/usr/local -DOPENSSL_SYS_SERENITY=1 --openssldir=${SERENITY_INSTALL_ROOT}/usr/local/ssl BSD-x86 zlib no-tests no-threads no-asm" configure() { run rm -rf ./test/ diff --git a/Ports/pkgconf/package.sh b/Ports/pkgconf/package.sh index 93f5d11f24..c5916364ee 100755 --- a/Ports/pkgconf/package.sh +++ b/Ports/pkgconf/package.sh @@ -8,7 +8,7 @@ useconfigure=true configopts="--prefix=/usr/local --with-pkg-config-dir=/usr/local/lib/pkgconfig" post_install() { - run mkdir -p "${SERENITY_BUILD_DIR}/Root/bin" + run mkdir -p "${SERENITY_INSTALL_ROOT}/bin" # FIXME: Same here, what is this about?! - run ln -sf /usr/local/bin/pkgconf "${SERENITY_BUILD_DIR}/Root/usr/local/bin/pkg-config" + run ln -sf /usr/local/bin/pkgconf "${SERENITY_INSTALL_ROOT}/usr/local/bin/pkg-config" } diff --git a/Ports/quake/package.sh b/Ports/quake/package.sh index 2185706566..79042203fb 100755 --- a/Ports/quake/package.sh +++ b/Ports/quake/package.sh @@ -8,4 +8,4 @@ makeopts="V=1 SYMBOLS_ON=Y " depends=SDL2 # FIXME: Uhh, the things in this directory are not supposed to run on the host, why add this to $PATH?! -export PATH="${SERENITY_BUILD_DIR}/Root/usr/bin:${PATH}" +export PATH="${SERENITY_INSTALL_ROOT}/usr/bin:${PATH}" diff --git a/Ports/sl/package.sh b/Ports/sl/package.sh index e393a444c6..dc9d4f4909 100755 --- a/Ports/sl/package.sh +++ b/Ports/sl/package.sh @@ -7,5 +7,5 @@ auth_type=md5 depends="ncurses" build() { - run ${CC} -I${SERENITY_BUILD_DIR}/Root/usr/local/include/ncurses -L${SERENITY_BUILD_DIR}/Root/usr/local/lib -o sl sl.c -lncurses -ltinfo + run ${CC} -I${SERENITY_INSTALL_ROOT}/usr/local/include/ncurses -L${SERENITY_INSTALL_ROOT}/usr/local/lib -o sl sl.c -lncurses -ltinfo } diff --git a/Ports/stress-ng/package.sh b/Ports/stress-ng/package.sh index 6343bfcb88..01dc9cd435 100755 --- a/Ports/stress-ng/package.sh +++ b/Ports/stress-ng/package.sh @@ -6,7 +6,7 @@ auth_type=md5 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" + export CFLAGS="-I${SERENITY_INSTALL_ROOT}/usr/local/include" + export LDFLAGS="-L${SERENITY_INSTALL_ROOT}/usr/local/lib -lzlib" } diff --git a/Ports/termcap/package.sh b/Ports/termcap/package.sh index 995d75f3b4..81422c2784 100755 --- a/Ports/termcap/package.sh +++ b/Ports/termcap/package.sh @@ -2,6 +2,6 @@ port=termcap version=1.3.1 useconfigure=true -configopts="--prefix=${SERENITY_BUILD_DIR}/Root/usr/local" +configopts="--prefix=${SERENITY_INSTALL_ROOT}/usr/local" files="https://ftpmirror.gnu.org/gnu/termcap/termcap-${version}.tar.gz termcap-${version}.tar.gz ffe6f86e63a3a29fa53ac645faaabdfa" auth_type=md5 diff --git a/Ports/xz/package.sh b/Ports/xz/package.sh index 7c27b25877..ed286f6f2a 100755 --- a/Ports/xz/package.sh +++ b/Ports/xz/package.sh @@ -7,7 +7,7 @@ auth_type=sha256 depends="zlib libiconv" install() { - run make DESTDIR=$DESTDIR $installopts install - ${CC} -shared -o $DESTDIR/usr/local/lib/liblzma.so -Wl,--whole-archive $DESTDIR/usr/local/lib/liblzma.a -Wl,--no-whole-archive -lz -liconv - rm -f $DESTDIR/usr/local/lib/liblzma.la + run make DESTDIR=${SERENITY_INSTALL_ROOT} $installopts install + ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/liblzma.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/liblzma.a -Wl,--no-whole-archive -lz -liconv + rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/liblzma.la } diff --git a/Ports/zlib/package.sh b/Ports/zlib/package.sh index d174531bdb..af2c8fe6ca 100755 --- a/Ports/zlib/package.sh +++ b/Ports/zlib/package.sh @@ -14,7 +14,7 @@ configure() { } install() { - run make DESTDIR=$DESTDIR $installopts install - ${CC} -shared -o $DESTDIR/usr/local/lib/libz.so -Wl,--whole-archive $DESTDIR/usr/local/lib/libz.a -Wl,--no-whole-archive - rm -f $DESTDIR/usr/local/lib/libz.la + run make DESTDIR=${SERENITY_INSTALL_ROOT} $installopts install + ${CC} -shared -o ${SERENITY_INSTALL_ROOT}/usr/local/lib/libz.so -Wl,--whole-archive ${SERENITY_INSTALL_ROOT}/usr/local/lib/libz.a -Wl,--no-whole-archive + rm -f ${SERENITY_INSTALL_ROOT}/usr/local/lib/libz.la } |