diff options
| author | Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> | 2021-02-20 16:02:15 -0800 |
|---|---|---|
| committer | Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> | 2021-02-20 16:02:15 -0800 |
| commit | 5d8d4fbbcb5c5de9370711c19bb3510210989a98 (patch) | |
| tree | d0754921833f413b7eb93fb6bb1b1c8a22fb0498 /lang/erlang | |
| parent | d651082447b4392399a40ea1ae11d0bce4bfe83a (diff) | |
treewide: Run refresh on all packages
The crude loop I wrote to come up with this changeset:
find -L package/feeds/packages/ -name patches | \
sed 's/patches$/refresh/' | sort | xargs make
Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
Diffstat (limited to 'lang/erlang')
| -rw-r--r-- | lang/erlang/patches/010-openssl-deprecated.patch | 8 | ||||
| -rw-r--r-- | lang/erlang/patches/020-erts-emulator-reorder-inclued-headers-paths.patch | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/lang/erlang/patches/010-openssl-deprecated.patch b/lang/erlang/patches/010-openssl-deprecated.patch index 91e76ab30..a6395baac 100644 --- a/lang/erlang/patches/010-openssl-deprecated.patch +++ b/lang/erlang/patches/010-openssl-deprecated.patch @@ -1,6 +1,6 @@ --- a/lib/crypto/c_src/crypto_callback.c +++ b/lib/crypto/c_src/crypto_callback.c -@@ -112,6 +112,7 @@ static ErlNifRWLock** lock_vec = NULL; /* Static locks used by openssl */ +@@ -112,6 +112,7 @@ static ErlNifRWLock** lock_vec = NULL; / #include <openssl/crypto.h> @@ -8,7 +8,7 @@ static INLINE void locking(int mode, ErlNifRWLock* lock) { switch (mode) { -@@ -132,7 +133,6 @@ static INLINE void locking(int mode, ErlNifRWLock* lock) +@@ -132,7 +133,6 @@ static INLINE void locking(int mode, Erl } } @@ -18,7 +18,7 @@ locking(mode, lock_vec[n]); --- a/lib/crypto/c_src/engine.c +++ b/lib/crypto/c_src/engine.c -@@ -244,7 +244,7 @@ ERL_NIF_TERM engine_load_dynamic_nif(ErlNifEnv* env, int argc, const ERL_NIF_TER +@@ -244,7 +244,7 @@ ERL_NIF_TERM engine_load_dynamic_nif(Erl #ifdef HAS_ENGINE_SUPPORT ASSERT(argc == 0); @@ -41,7 +41,7 @@ #ifdef HAVE_DYNAMIC_CRYPTO_LIB # if defined(DEBUG) -@@ -77,7 +82,7 @@ ERL_NIF_TERM info_lib(ErlNifEnv *env, int argc, const ERL_NIF_TERM argv[]) +@@ -77,7 +82,7 @@ ERL_NIF_TERM info_lib(ErlNifEnv *env, in ASSERT(argc == 0); name_sz = strlen(libname); diff --git a/lang/erlang/patches/020-erts-emulator-reorder-inclued-headers-paths.patch b/lang/erlang/patches/020-erts-emulator-reorder-inclued-headers-paths.patch index 7a6e469df..84140e184 100644 --- a/lang/erlang/patches/020-erts-emulator-reorder-inclued-headers-paths.patch +++ b/lang/erlang/patches/020-erts-emulator-reorder-inclued-headers-paths.patch @@ -22,11 +22,9 @@ Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> erts/emulator/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in -index 7145824..d079487 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in -@@ -712,7 +712,7 @@ +@@ -751,7 +751,7 @@ endif # Usually the same as the default rule, but certain platforms (e.g. win32) mix # different compilers $(OBJDIR)/beam_emu.o: beam/beam_emu.c @@ -35,7 +33,7 @@ index 7145824..d079487 100644 $(OBJDIR)/beam_emu.S: beam/beam_emu.c $(V_EMU_CC) -S -fverbose-asm $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@ -@@ -765,7 +765,7 @@ +@@ -804,7 +804,7 @@ endif # General targets # $(OBJDIR)/%.o: beam/%.c |
