mirror of
https://github.com/archr-linux/Arch-R.git
synced 2026-07-12 18:19:42 -07:00
Update package.mk files to enable shared libraries for libmodplug, libsamplerate, libffi, and pcre2; modify DISTRO_DISKLABEL in options; add CMake options for libwebp; enhance mkimage script to hide root partition from file managers.
This commit is contained in:
@@ -209,7 +209,7 @@
|
||||
# Partition labels for USB/SD installation media
|
||||
DISTRO_BOOTLABEL="ARCHR"
|
||||
DISTRO_ROOTLABEL="ARCHR_ROOT"
|
||||
DISTRO_DISKLABEL="STORAGE"
|
||||
DISTRO_DISKLABEL="ROMS"
|
||||
|
||||
# Settings package name - blank if not required
|
||||
DISTRO_PKG_SETTINGS=""
|
||||
|
||||
@@ -12,4 +12,4 @@ PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_LONGDESC="libmodplug renders mod music files as raw audio data, for playing or conversion."
|
||||
PKG_BUILD_FLAGS="+pic"
|
||||
|
||||
PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"
|
||||
PKG_CONFIGURE_OPTS_TARGET="--enable-static --enable-shared"
|
||||
|
||||
@@ -13,7 +13,7 @@ PKG_LONGDESC="A Sample Rate Converter for audio."
|
||||
PKG_TOOLCHAIN="autotools"
|
||||
|
||||
# package specific configure options
|
||||
PKG_CONFIGURE_OPTS_TARGET="--disable-shared \
|
||||
PKG_CONFIGURE_OPTS_TARGET="--enable-shared \
|
||||
--enable-static \
|
||||
--datadir=/usr/share \
|
||||
--disable-fftw \
|
||||
|
||||
@@ -14,7 +14,7 @@ PKG_LONGDESC="Foreign Function Interface Library."
|
||||
PKG_TOOLCHAIN="autotools"
|
||||
|
||||
PKG_CONFIGURE_OPTS_TARGET="--disable-debug \
|
||||
--enable-static --disable-shared \
|
||||
--enable-static --enable-shared \
|
||||
--with-pic \
|
||||
--enable-structs \
|
||||
--enable-raw-api \
|
||||
|
||||
@@ -22,7 +22,7 @@ PKG_CMAKE_OPTS_HOST="-DBUILD_SHARED_LIBS=OFF \
|
||||
-DPCRE2_SUPPORT_LIBEDIT=OFF \
|
||||
-DPCRE2_SUPPORT_LIBREADLINE=OFF"
|
||||
|
||||
PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=OFF \
|
||||
PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=ON \
|
||||
-DPCRE2_BUILD_PCRE2_8=ON \
|
||||
-DPCRE2_BUILD_PCRE2_16=ON \
|
||||
-DPCRE2_SUPPORT_JIT=ON \
|
||||
|
||||
@@ -10,3 +10,5 @@ PKG_DEPENDS_HOST="toolchain:host"
|
||||
PKG_DEPENDS_TARGET="toolchain"
|
||||
PKG_LONGDESC="WebP codec is a library to encode and decode images in WebP format."
|
||||
PKG_TOOLCHAIN="cmake"
|
||||
|
||||
PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=ON"
|
||||
|
||||
@@ -94,6 +94,9 @@ if [ "${ROOTFS_TYPE}" = "ext4" ]; then
|
||||
parted -s "${DISK}" -a min unit s mkpart primary ext4 ${ROOT_PART_START} ${ROOT_PART_END}
|
||||
parted -s "${DISK}" -a min unit s mkpart primary ext4 ${STORAGE_PART_START} ${STORAGE_PART_END}
|
||||
parted -s "${DISK}" set 1 boot on
|
||||
# Hide root partition from desktop file managers by setting type to 0xDA (Non-FS data).
|
||||
# The kernel still mounts it by LABEL from the boot cmdline.
|
||||
sfdisk --part-type "${DISK}" 2 da >"${SAVE_ERROR}" 2>&1 || true
|
||||
fi
|
||||
|
||||
# Set SYSTEM_PART_START for boot partition (used by bootloader dd and part1 merge)
|
||||
|
||||
Reference in New Issue
Block a user