Ports: Fix detection for -ldl

6 files changed, 6 insertions, 70 deletions

diff --git a/Ports/bash/patches/disable-dynamic-loading.patch b/Ports/bash/patches/disable-dynamic-loading.patch
deleted file mode 100644
index 6e088b987c..0000000000
--- a/Ports/bash/patches/disable-dynamic-loading.patch
+++ /dev/null
@@ -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
diff --git a/Ports/gnupg/package.sh b/Ports/gnupg/package.sh
index 410700531e..3dd7a91112 100755
--- a/Ports/gnupg/package.sh
+++ b/Ports/gnupg/package.sh
@@ -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() {
diff --git a/Ports/lua/patches/lua.patch b/Ports/lua/patches/lua.patch
index a50cb7d6a1..948374826f 100644
--- a/Ports/lua/patches/lua.patch
+++ b/Ports/lua/patches/lua.patch
@@ -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
diff --git a/Ports/openssl/package.sh b/Ports/openssl/package.sh
index f0e5d17071..814c930e99 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_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/
diff --git a/Ports/tinycc/package.sh b/Ports/tinycc/package.sh
index f5287732ff..d69aa6733f 100755
--- a/Ports/tinycc/package.sh
+++ b/Ports/tinycc/package.sh
@@ -13,5 +13,3 @@ configure() {
         --triplet="${SERENITY_ARCH}-pc-serenity" \
         --crtprefix=/usr/lib
 }
-
-export CONFIG_ldl=no
diff --git a/Ports/tinyscheme/package.sh b/Ports/tinyscheme/package.sh
index 7511bb8613..74981755cc 100755
--- a/Ports/tinyscheme/package.sh
+++ b/Ports/tinyscheme/package.sh
@@ -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() {