beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-25 09:00:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Ports: Fix detection for -ldl

Browse source
This commit is contained in:
Gunnar Beutner 2021-04-25 07:21:28 +02:00 committed by Andreas Kling
parent adaf2b347c
commit 6a825510a0
Notes: sideshowbarker 2024-07-18 19:07:14 +09:00 
Author: https://github.com/gunnarbeutner
Commit: https://github.com/SerenityOS/serenity/commit/6a825510a05
Pull-request: https://github.com/SerenityOS/serenity/pull/6611
6 changed files with 6 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
Ports/bash/patches/disable-dynamic-loading.patch
View file

@ -1,63 +0,0 @@
--- a/configure.ac 2019-01-02 17:39:11.000000000 +0300
+++ b/configure.ac 2019-11-19 17:18:54.094241509 +0300
@@ -1164,25 +1164,9 @@
fi
#
-# Shared object configuration section. These values are generated by
-# ${srcdir}/support/shobj-conf
-#
-if test "$ac_cv_func_dlopen" = "yes" && test -f ${srcdir}/support/shobj-conf
-then
- AC_MSG_CHECKING(shared object configuration for loadable builtins)
- eval `${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c "${host_cpu}" -o "${host_os}" -v "${host_vendor}"`
- AC_SUBST(SHOBJ_CC)
- AC_SUBST(SHOBJ_CFLAGS)
- AC_SUBST(SHOBJ_LD)
- AC_SUBST(SHOBJ_LDFLAGS)
- AC_SUBST(SHOBJ_XLDFLAGS)
- AC_SUBST(SHOBJ_LIBS)
- AC_SUBST(SHOBJ_STATUS)
- AC_MSG_RESULT($SHOBJ_STATUS)
-else
- SHOBJ_STATUS=unsupported
- AC_SUBST(SHOBJ_STATUS)
-fi
+# Shared object configuration section.
+SHOBJ_STATUS=unsupported
+AC_SUBST(SHOBJ_STATUS)
# try to create a directory tree if the source is elsewhere
# this should be packaged into a script accessible via ${srcdir}/support
--- a/configure 2019-01-02 17:43:31.000000000 +0300
+++ b/configure 2019-11-19 17:18:56.126259727 +0300
@@ -16367,27 +16367,8 @@
fi
#
-# Shared object configuration section. These values are generated by
-# ${srcdir}/support/shobj-conf
-#
-if test "$ac_cv_func_dlopen" = "yes" && test -f ${srcdir}/support/shobj-conf
-then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking shared object configuration for loadable builtins" >&5
-$as_echo_n "checking shared object configuration for loadable builtins... " >&6; }
- eval `${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c "${host_cpu}" -o "${host_os}" -v "${host_vendor}"`
-
-
-
-
-
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHOBJ_STATUS" >&5
-$as_echo "$SHOBJ_STATUS" >&6; }
-else
- SHOBJ_STATUS=unsupported
-
-fi
+# Shared object configuration section.
+SHOBJ_STATUS=unsupported
# try to create a directory tree if the source is elsewhere
# this should be packaged into a script accessible via ${srcdir}/support

2
Ports/gnupg/package.sh
View file

@ -15,7 +15,7 @@ depends="libiconv libgpg-error libgcrypt libksba libassuan npth ntbtls"
pre_configure() {
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"
export LDFLAGS="-L${SERENITY_INSTALL_ROOT}/usr/local/lib -lm -liconv -ldl"
}
configure() {

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

@ -22,7 +22,7 @@ diff -Naur lua-5.3.5/src/Makefile lua-5.3.5.serenity/src/Makefile
LUA_A= liblua.a
CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \
@@ -124,6 +124,14 @@
@@ -124,6 +124,15 @@
solaris:
$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN -D_REENTRANT" SYSLIBS="-ldl"
@ -32,7 +32,8 @@ diff -Naur lua-5.3.5/src/Makefile lua-5.3.5.serenity/src/Makefile
+ CC="i686-pc-serenity-gcc -std=gnu99" \
+ AR="i686-pc-serenity-ar rcu" \
+ RANLIB="i686-pc-serenity-ranlib" \
+ SYSCFLAGS="-DLUA_USE_DLOPEN"
+ SYSCFLAGS="-DLUA_USE_DLOPEN" \
+ SYSLIBS="-ldl"
+
# list targets that do not create files (but not all makes understand .PHONY)
.PHONY: all $(PLATS) default o a clean depend echo none

2
Ports/openssl/package.sh
View file

@ -11,7 +11,7 @@ auth_import_key="8657ABB260F056B1E5190839D9C4D26D0E604491"
auth_opts="openssl-${version}.tar.gz.asc openssl-${version}.tar.gz"
depends="zlib"
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"
configopts="--prefix=${SERENITY_INSTALL_ROOT}/usr/local -DOPENSSL_SYS_SERENITY=1 --openssldir=${SERENITY_INSTALL_ROOT}/usr/local/ssl linux-elf zlib no-tests no-threads no-asm"
configure() {
run rm -rf ./test/

2
Ports/tinycc/package.sh
View file

@ -13,5 +13,3 @@ configure() {
--triplet="${SERENITY_ARCH}-pc-serenity" \
--crtprefix=/usr/lib
}
export CONFIG_ldl=no

2
Ports/tinyscheme/package.sh
View file

@ -6,7 +6,7 @@ auth_type=md5
useconfigure=false
build() {
run make scheme CC="${CC} -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='-ldl' FEATURES='-DUSE_NO_FEATURES=1 -DInitFile=\"/usr/local/include/tinyscheme/init.scm\"'
}
install() {