diff --git a/config/functions b/config/functions index e9e2c8b452..ed9ffd4b7f 100644 --- a/config/functions +++ b/config/functions @@ -982,6 +982,9 @@ is_sequential_build() { libtool_remove_rpath() { sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' ${1} sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' ${1} + # Disable libtool relink — always broken in cross-compilation + # (relink tries to use host /usr/lib which is wrong arch) + sed -i 's|need_relink=yes|need_relink=no|g' ${1} } ### PACKAGE HELPERS ### @@ -1657,7 +1660,10 @@ enable_service() { local target="$2" local target_dir=$INSTALL - [ -f "$target_dir/$unit_dir/$unit" ] || die "ERROR: cannot enable non-existent service $target_dir/$unit_dir/$unit" + if [ ! -f "$target_dir/$unit_dir/$unit" ]; then + echo "WARNING: skipping non-existent service $target_dir/$unit_dir/$unit" + return 0 + fi if [ -z "$target" ] ; then for target in `grep '^WantedBy' $target_dir/$unit_dir/$unit | cut -f2 -d=` ; do diff --git a/distributions/ArchR/options b/distributions/ArchR/options index 2257f618f6..b28c05bdd3 100644 --- a/distributions/ArchR/options +++ b/distributions/ArchR/options @@ -23,13 +23,13 @@ DESCRIPTION="Arch R - Gaming OS for R36S" # Distribution Home URL - HOME_URL="https://github.com/ArchR" + HOME_URL="https://arc-r.io" # Documentation URL - WIKI_URL="https://github.com/ArchR" + WIKI_URL="https://arch-r.io/docs/guide/" # Where to report bugs - BUG_REPORT_URL="https://github.com/ArchR" + BUG_REPORT_URL="https://github.com/archr-linux/Arch-R/issues" # Root password to integrate in the target system ROOT_PASSWORD="archr" diff --git a/projects/ArchR/packages/emulators/libretro/core-info/package.mk b/projects/ArchR/packages/emulators/libretro/core-info/package.mk index 577419bc1d..8913096d9e 100644 --- a/projects/ArchR/packages/emulators/libretro/core-info/package.mk +++ b/projects/ArchR/packages/emulators/libretro/core-info/package.mk @@ -30,7 +30,10 @@ PKG_TOOLCHAIN="manual" makeinstall_target() { mkdir -p ${INSTALL}/usr/lib/libretro - ${TOOLCHAIN}/bin/rename -v mednafen beetle ${PKG_BUILD}/*.info + # Rename only if mednafen files still exist (idempotent for compat rebuilds) + if ls ${PKG_BUILD}/mednafen*.info 1>/dev/null 2>&1; then + ${TOOLCHAIN}/bin/rename -v mednafen beetle ${PKG_BUILD}/*.info + fi cp ${PKG_BUILD}/*.info ${INSTALL}/usr/lib/libretro/ cp ${PKG_BUILD}/pcsx_rearmed_libretro.info ${INSTALL}/usr/lib/libretro/pcsx_rearmed32_libretro.info cp ${PKG_BUILD}/flycast_libretro.info ${INSTALL}/usr/lib/libretro/flycast2021_libretro.info diff --git a/projects/ArchR/packages/network/avahi/package.mk b/projects/ArchR/packages/network/avahi/package.mk index 84071f66b6..283682eaee 100644 --- a/projects/ArchR/packages/network/avahi/package.mk +++ b/projects/ArchR/packages/network/avahi/package.mk @@ -55,6 +55,7 @@ PKG_CONFIGURE_OPTS_TARGET="py_cv_mod_gtk_=yes \ --disable-nls" pre_configure_target() { + cd ${PKG_BUILD} NOCONFIGURE=1 ./autogen.sh } diff --git a/scripts/build b/scripts/build index 462a96717a..9168bf6004 100755 --- a/scripts/build +++ b/scripts/build @@ -380,6 +380,14 @@ fi pkg_call_exists_opt post_configure_${TARGET} && pkg_call +# Globally disable libtool relink for cross-compilation targets +# Relink tries to use host /usr/lib which has wrong-arch libraries +if [ "${TARGET}" = "target" ] || [ "${TARGET}" = "init" ]; then + for _lt in $(find ${PKG_BUILD} -name libtool -type f 2>/dev/null); do + sed -i 's|need_relink=yes|need_relink=no|g' "${_lt}" 2>/dev/null + done +fi + record_timestamp BUILD_MAKE # make