diff options
Diffstat (limited to 'lang/erlang/files')
| -rw-r--r-- | lang/erlang/files/patch-configure | 40 | ||||
| -rw-r--r-- | lang/erlang/files/patch-erts_etc_unix_run__erl.c | 8 | ||||
| -rw-r--r-- | lang/erlang/files/patch-lib_crypto_c__src_Makefile.in | 8 | ||||
| -rw-r--r-- | lang/erlang/files/patch-lib_crypto_priv_Makefile | 11 | ||||
| -rw-r--r-- | lang/erlang/files/patch-lib_hipe_llvm_hipe__llvm__main.erl | 11 | ||||
| -rw-r--r-- | lang/erlang/files/patch-lib_stdlib_src_calendar.erl | 4 |
6 files changed, 50 insertions, 32 deletions
diff --git a/lang/erlang/files/patch-configure b/lang/erlang/files/patch-configure new file mode 100644 index 000000000000..9713b597b9dc --- /dev/null +++ b/lang/erlang/files/patch-configure @@ -0,0 +1,40 @@ +--- configure.orig 2021-09-13 14:43:59 UTC ++++ configure +@@ -55,7 +55,7 @@ skip_applications= + while test $# != 0; do + case $1 in + -srcdir=* | --srcdir=*) +- user_srcdir=`expr "$1" : '[^=]*=\(.*\)'` ++ user_srcdir=`expr -- "$1" : '[^=]*=\(.*\)'` + if test "$ERL_TOP" != ""; then + echo "WARNING: Overriding ERL_TOP with $user_srcdir" 1>&2 + echo "" 1>&2 +@@ -95,7 +95,7 @@ while test $# != 0; do + echo "" 1>&2 + ;; + -cache-file=* | --cache-file=* ) +- static_cache=`expr "$1" : '[^=]*=\(.*\)'` ++ static_cache=`expr -- "$1" : '[^=]*=\(.*\)'` + if test "$static_cache" != "/dev/null"; then + echo "WARNING: Only using config cache file '$static_cache' as static cache" 1>&2 + echo "" 1>&2 +@@ -140,8 +140,8 @@ while test $# != 0; do + pie_ldflags="-no-pie" + ;; + CFLAGS=* | LDFLAGS=*) +- flgs_var=`expr "$1" : '\([^=]*\)=.*'` +- flgs_val=`expr "$1" : '[^=]*=\(.*\)'` ++ flgs_var=`expr -- "$1" : '\([^=]*\)=.*'` ++ flgs_val=`expr -- "$1" : '[^=]*=\(.*\)'` + eval $flgs_var=\$flgs_val + ;; + --help=r* | -help=r*) +@@ -151,7 +151,7 @@ while test $# != 0; do + *) + case $1 in + --without-*) +- skip_app=`expr "$1" : '--without-\(.*\)'` ++ skip_app=`expr -- "$1" : '--without-\(.*\)'` + if [ "$skip_app" = "stdlib" ] || + [ "$skip_app" = "kernel" ] || + [ "$skip_app" = "sasl" ] || diff --git a/lang/erlang/files/patch-erts_etc_unix_run__erl.c b/lang/erlang/files/patch-erts_etc_unix_run__erl.c index b76c5127d2a8..1a9d2edc6ffe 100644 --- a/lang/erlang/files/patch-erts_etc_unix_run__erl.c +++ b/lang/erlang/files/patch-erts_etc_unix_run__erl.c @@ -1,8 +1,8 @@ ---- erts/etc/unix/run_erl.c.orig 2015-03-31 12:32:52 UTC +--- erts/etc/unix/run_erl.c.orig 2021-09-02 10:21:16 UTC +++ erts/etc/unix/run_erl.c -@@ -73,9 +73,6 @@ - #ifdef HAVE_UTMP_H - # include <utmp.h> +@@ -81,9 +81,6 @@ + #ifdef HAVE_LIBUTIL_H + # include <libutil.h> #endif -#ifdef HAVE_UTIL_H -# include <util.h> diff --git a/lang/erlang/files/patch-lib_crypto_c__src_Makefile.in b/lang/erlang/files/patch-lib_crypto_c__src_Makefile.in index 65e1b759ad66..8397bcac2200 100644 --- a/lang/erlang/files/patch-lib_crypto_c__src_Makefile.in +++ b/lang/erlang/files/patch-lib_crypto_c__src_Makefile.in @@ -1,9 +1,9 @@ ---- lib/crypto/c_src/Makefile.in.orig 2016-03-14 20:11:15 UTC +--- lib/crypto/c_src/Makefile.in.orig 2021-05-27 09:40:45 UTC +++ lib/crypto/c_src/Makefile.in -@@ -90,7 +90,7 @@ endif - DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@ +@@ -136,7 +136,7 @@ endif + endif - ifeq ($(DYNAMIC_CRYPTO_LIB),yes) + ifeq ($(DYNAMIC_OR_WIN_CRYPTO_LIB),yes) -SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@ +SSL_DED_LD_RUNTIME_LIBRARY_PATH = CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME) diff --git a/lang/erlang/files/patch-lib_crypto_priv_Makefile b/lang/erlang/files/patch-lib_crypto_priv_Makefile deleted file mode 100644 index 26f2c38e360d..000000000000 --- a/lang/erlang/files/patch-lib_crypto_priv_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/crypto/priv/Makefile.orig 2016-03-14 20:11:15 UTC -+++ lib/crypto/priv/Makefile -@@ -61,7 +61,7 @@ OBJS = $(OBJDIR)/crypto.o - # ---------------------------------------------------- - - $(SO_NIFLIB): $(OBJS) -- $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \ -+ $(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \ - -o $@ $^ -lcrypto - - $(DLL_NIFLIB): $(OBJS) diff --git a/lang/erlang/files/patch-lib_hipe_llvm_hipe__llvm__main.erl b/lang/erlang/files/patch-lib_hipe_llvm_hipe__llvm__main.erl deleted file mode 100644 index 633d84504d99..000000000000 --- a/lang/erlang/files/patch-lib_hipe_llvm_hipe__llvm__main.erl +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/hipe/llvm/hipe_llvm_main.erl.orig 2015-06-27 20:52:09 UTC -+++ lib/hipe/llvm/hipe_llvm_main.erl -@@ -474,7 +474,7 @@ unique_folder(FunName, Arity, Options) - - true -> %% Store folder in current directory - DirName; - false -> %% Temporarily store folder in tempfs (/dev/shm/) -- "/dev/shm/" ++ DirName -+ "/tmp/" ++ DirName - end, - %% Make sure it does not exist - case dir_exists(Dir) of diff --git a/lang/erlang/files/patch-lib_stdlib_src_calendar.erl b/lang/erlang/files/patch-lib_stdlib_src_calendar.erl index 34b753d85b27..30bb7423b8d4 100644 --- a/lang/erlang/files/patch-lib_stdlib_src_calendar.erl +++ b/lang/erlang/files/patch-lib_stdlib_src_calendar.erl @@ -1,6 +1,6 @@ ---- lib/stdlib/src/calendar.erl.orig 2015-03-31 12:32:52 UTC +--- lib/stdlib/src/calendar.erl.orig 2021-09-02 10:21:16 UTC +++ lib/stdlib/src/calendar.erl -@@ -279,11 +279,19 @@ local_time_to_universal_time(DateTime, I +@@ -297,11 +297,19 @@ local_time_to_universal_time(DateTime, IsDst) -> DateTime1 :: datetime1970(), DateTime :: datetime1970(). local_time_to_universal_time_dst(DateTime) -> |