CVS commit: pkgsrc/lang/erlang

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/lang/erlang
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Thu, 2 Nov 2023 19:20:46 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Nov  2 19:20:46 UTC 2023

Modified Files:
        pkgsrc/lang/erlang: distinfo
        pkgsrc/lang/erlang/patches: patch-lib_crypto_c__src_Makefile.in
Added Files:
        pkgsrc/lang/erlang/patches: patch-erts_emulator_Makefile.in
            patch-lib_asn1_c__src_Makefile
            patch-lib_megaco_src_flex_Makefile.in
            patch-lib_odbc_c__src_Makefile.in
            patch-lib_runtime__tools_c__src_Makefile.in patch-make_otp.mk.in
Removed Files:
        pkgsrc/lang/erlang/patches: patch-ab patch-ay

Log Message:
erlang: use BSD_INSTALL_LIB to install shared libraries instead of INSTALL_PROGRAM; this avoid stripping on some platforms like Darwin


To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 pkgsrc/lang/erlang/distinfo
cvs rdiff -u -r1.7 -r0 pkgsrc/lang/erlang/patches/patch-ab
cvs rdiff -u -r1.3 -r0 pkgsrc/lang/erlang/patches/patch-ay
cvs rdiff -u -r0 -r1.4 \
    pkgsrc/lang/erlang/patches/patch-erts_emulator_Makefile.in
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/erlang/patches/patch-lib_asn1_c__src_Makefile \
    pkgsrc/lang/erlang/patches/patch-lib_megaco_src_flex_Makefile.in \
    pkgsrc/lang/erlang/patches/patch-lib_odbc_c__src_Makefile.in \
    pkgsrc/lang/erlang/patches/patch-make_otp.mk.in
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/lang/erlang/patches/patch-lib_crypto_c__src_Makefile.in
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/lang/erlang/patches/patch-lib_runtime__tools_c__src_Makefile.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/erlang/distinfo
diff -u pkgsrc/lang/erlang/distinfo:1.107 pkgsrc/lang/erlang/distinfo:1.108
--- pkgsrc/lang/erlang/distinfo:1.107   Mon Oct 23 14:41:05 2023
+++ pkgsrc/lang/erlang/distinfo Thu Nov  2 19:20:46 2023
@@ -1,14 +1,18 @@
-$NetBSD: distinfo,v 1.107 2023/10/23 14:41:05 adam Exp $
+$NetBSD: distinfo,v 1.108 2023/11/02 19:20:46 adam Exp $
 
 BLAKE2s (erlang-26.1.2.tar.gz) = f01e68ac4b232ce0fb4b303c69a3ba6a403892b02d34588e2d22a217a9da79dc
 SHA512 (erlang-26.1.2.tar.gz) = 6907bba4ee726582b6344995c73223f725ea628897b34fc807a2a0306536bb15ce55c7fd4da1cb596dc59c9695b3bb6bba59618ca2a7a9a999e183f671656710
 Size (erlang-26.1.2.tar.gz) = 63932020 bytes
-SHA1 (patch-ab) = 9d1e33ab3660b5cf0faa2b74129158b71aae408f
-SHA1 (patch-ay) = 21dc0a123ae0d6f8e86f3fb9ffaf66e26361172b
+SHA1 (patch-erts_emulator_Makefile.in) = b99ccd2669652b1542b2ee99e09f886d864fd8be
 SHA1 (patch-erts_emulator_drivers_common_inet__drv.c) = dbe72306aac6be0cec09f45869ff077f1bab1e68
 SHA1 (patch-erts_emulator_nifs_unix_unix__socket__syncio.c) = 6bad5f82ca72c46d3b8e4e0c5a4a7622ff85d3bf
 SHA1 (patch-erts_emulator_sys_unix_sys__uds.c) = ee131143c177b2bc1453d94097cbf6b3d3cfb899
 SHA1 (patch-erts_etc_unix_run__erl.c) = b888aaed44cab4eea87474f7f02adba1f904e033
 SHA1 (patch-erts_lib__src_common_erl__printf.c) = e156722b0617a4a9eb1eb7ea63365cb52ff2e2c9
-SHA1 (patch-lib_crypto_c__src_Makefile.in) = d1f3004e7551231d415fcd240abe13760cfa7277
+SHA1 (patch-lib_asn1_c__src_Makefile) = d47870e58de5e10a94dfa9f4a274c88261633e5b
+SHA1 (patch-lib_crypto_c__src_Makefile.in) = 025efecaa05f8a190a9024c475cbe5e9ab9286d9
+SHA1 (patch-lib_megaco_src_flex_Makefile.in) = 06eb5a76cc2e5adb4294c7db6919bb7c083c425c
+SHA1 (patch-lib_odbc_c__src_Makefile.in) = 21dc0a123ae0d6f8e86f3fb9ffaf66e26361172b
+SHA1 (patch-lib_runtime__tools_c__src_Makefile.in) = 98d351192902d5f6d3bd506c6e382caa06642383
+SHA1 (patch-make_otp.mk.in) = 9d1e33ab3660b5cf0faa2b74129158b71aae408f
 SHA1 (patch-make_output.mk.in) = d7b3da58bfb471d52c41242e2a03d1598ce24e62

Index: pkgsrc/lang/erlang/patches/patch-lib_crypto_c__src_Makefile.in
diff -u pkgsrc/lang/erlang/patches/patch-lib_crypto_c__src_Makefile.in:1.3 pkgsrc/lang/erlang/patches/patch-lib_crypto_c__src_Makefile.in:1.4
--- pkgsrc/lang/erlang/patches/patch-lib_crypto_c__src_Makefile.in:1.3  Wed Jan 11 21:58:43 2023
+++ pkgsrc/lang/erlang/patches/patch-lib_crypto_c__src_Makefile.in      Thu Nov  2 19:20:46 2023
@@ -1,10 +1,10 @@
-$NetBSD: patch-lib_crypto_c__src_Makefile.in,v 1.3 2023/01/11 21:58:43 nikita Exp $
+$NetBSD: patch-lib_crypto_c__src_Makefile.in,v 1.4 2023/11/02 19:20:46 adam Exp $
 
-Compile via CC wrapper to ensure correct flags.
+Properly install shared objects.
 
---- lib/crypto/c_src/Makefile.in.orig  2022-12-12 08:30:54.000000000 +0100
-+++ lib/crypto/c_src/Makefile.in       2023-01-11 22:23:39.931423171 +0100
-@@ -147,7 +147,7 @@
+--- lib/crypto/c_src/Makefile.in.orig  2023-10-11 15:12:39.000000000 +0000
++++ lib/crypto/c_src/Makefile.in
+@@ -147,7 +147,7 @@ endif
  endif
  
  ifeq ($(DYNAMIC_OR_WIN_CRYPTO_LIB),yes)
@@ -13,7 +13,7 @@ Compile via CC wrapper to ensure correct
  CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME)
  EXTRA_FLAGS = -DHAVE_DYNAMIC_CRYPTO_LIB
  else
-@@ -232,7 +232,7 @@
+@@ -232,7 +232,7 @@ $(LIBDIR)/crypto$(TYPEMARKER).dll: $(CRY
  ifeq ($(DYNAMIC_OR_WIN_CRYPTO_LIB),yes)
  $(LIBDIR)/crypto_callback$(TYPEMARKER).so: $(CALLBACK_OBJS)
        $(INSTALL_DIR) $(LIBDIR)
@@ -22,3 +22,20 @@ Compile via CC wrapper to ensure correct
  
  $(LIBDIR)/crypto_callback$(TYPEMARKER).dll: $(CALLBACK_OBJS)
        $(INSTALL_DIR) $(LIBDIR)
+@@ -266,13 +266,13 @@ include $(ERL_TOP)/make/otp_release_targ
+ 
+ release_spec: opt
+       $(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
+-      $(INSTALL_PROGRAM) $(NIF_LIB) "$(RELSYSDIR)/priv/lib"
++      ${BSD_INSTALL_LIB} $(NIF_LIB) "$(RELSYSDIR)/priv/lib"
+ ifeq ($(DYNAMIC_OR_WIN_CRYPTO_LIB),yes)
+-      $(INSTALL_PROGRAM) $(CALLBACK_LIB) "$(RELSYSDIR)/priv/lib"
++      ${BSD_INSTALL_LIB} $(CALLBACK_LIB) "$(RELSYSDIR)/priv/lib"
+ endif
+ ifeq ($(DISABLE_OTP_TEST_ENGINE),yes)
+ else
+-      $(INSTALL_PROGRAM) $(TEST_ENGINE_LIB) "$(RELSYSDIR)/priv/lib"
++      ${BSD_INSTALL_LIB} $(TEST_ENGINE_LIB) "$(RELSYSDIR)/priv/lib"
+ endif
+ 
+ release_docs_spec:

Added files:

Index: pkgsrc/lang/erlang/patches/patch-erts_emulator_Makefile.in
diff -u /dev/null pkgsrc/lang/erlang/patches/patch-erts_emulator_Makefile.in:1.4
--- /dev/null   Thu Nov  2 19:20:46 2023
+++ pkgsrc/lang/erlang/patches/patch-erts_emulator_Makefile.in  Thu Nov  2 19:20:46 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-erts_emulator_Makefile.in,v 1.4 2023/11/02 19:20:46 adam Exp $
+
+Properly install shared objects.
+
+--- erts/emulator/Makefile.in.orig     2023-11-02 13:47:00.312356819 +0000
++++ erts/emulator/Makefile.in
+@@ -483,7 +483,7 @@ all: $(BINDIR)/$(EMULATOR_EXECUTABLE) $(
+ endif
+ 
+ $(BINDIR)/$(PRIMARY_EXECUTABLE): $(BINDIR)/$(FLAVOR_EXECUTABLE)
+-      $(INSTALL_PROGRAM) $< $@
++      ${BSD_INSTALL_LIB} $< $@
+ ifeq ($(TARGET), win32)
+       $(INSTALL_PROGRAM) $(basename $<).pdb $(basename $@).pdb
+ endif

Index: pkgsrc/lang/erlang/patches/patch-lib_asn1_c__src_Makefile
diff -u /dev/null pkgsrc/lang/erlang/patches/patch-lib_asn1_c__src_Makefile:1.1
--- /dev/null   Thu Nov  2 19:20:46 2023
+++ pkgsrc/lang/erlang/patches/patch-lib_asn1_c__src_Makefile   Thu Nov  2 19:20:46 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_asn1_c__src_Makefile,v 1.1 2023/11/02 19:20:46 adam Exp $
+
+Properly install shared objects.
+
+--- lib/asn1/c_src/Makefile.orig       2023-11-02 14:46:32.370098570 +0000
++++ lib/asn1/c_src/Makefile
+@@ -136,7 +136,7 @@ include $(ERL_TOP)/make/otp_release_targ
+ 
+ release_spec: opt
+       $(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
+-      $(INSTALL_PROGRAM) $(NIF_SHARED_OBJ_FILE) "$(RELSYSDIR)/priv/lib"
++      ${BSD_INSTALL_LIB} $(NIF_SHARED_OBJ_FILE) "$(RELSYSDIR)/priv/lib"
+       $(INSTALL_DIR) "$(RELSYSDIR)/c_src"
+       $(INSTALL_DATA) *.c "$(RELSYSDIR)/c_src"
+ 
Index: pkgsrc/lang/erlang/patches/patch-lib_megaco_src_flex_Makefile.in
diff -u /dev/null pkgsrc/lang/erlang/patches/patch-lib_megaco_src_flex_Makefile.in:1.1
--- /dev/null   Thu Nov  2 19:20:46 2023
+++ pkgsrc/lang/erlang/patches/patch-lib_megaco_src_flex_Makefile.in    Thu Nov  2 19:20:46 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_megaco_src_flex_Makefile.in,v 1.1 2023/11/02 19:20:46 adam Exp $
+
+Properly install shared objects.
+
+--- lib/megaco/src/flex/Makefile.in.orig       2023-11-02 14:49:55.001588017 +0000
++++ lib/megaco/src/flex/Makefile.in
+@@ -252,7 +252,7 @@ release_spec: opt
+       $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true)
+       $(INSTALL_DATA) $(FLEX_FILES) $(C_TARGETS) "$(RELSYSDIR)/src/flex"
+-      $(INSTALL_PROGRAM) $(SOLIBS) "$(RELSYSDIR)/priv/lib"
++      ${BSD_INSTALL_LIB} $(SOLIBS) "$(RELSYSDIR)/priv/lib"
+ endif
+ 
+ 
Index: pkgsrc/lang/erlang/patches/patch-lib_odbc_c__src_Makefile.in
diff -u /dev/null pkgsrc/lang/erlang/patches/patch-lib_odbc_c__src_Makefile.in:1.1
--- /dev/null   Thu Nov  2 19:20:46 2023
+++ pkgsrc/lang/erlang/patches/patch-lib_odbc_c__src_Makefile.in        Thu Nov  2 19:20:46 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_odbc_c__src_Makefile.in,v 1.1 2023/11/02 19:20:46 adam Exp $
+
+Pass in proper LDFLAGS. Fixes build with iodbc.
+
+--- lib/odbc/c_src/Makefile.in.orig    2010-02-19 20:07:30.000000000 +0200
++++ lib/odbc/c_src/Makefile.in 2010-06-21 23:28:49.000000000 +0300
+@@ -82,7 +82,7 @@
+ CFLAGS = $(TYPEFLAGS) @CFLAGS@ @THR_DEFS@ @DEFS@
+ EI_LDFLAGS = -L$(EI_ROOT)/obj$(TYPEMARKER)/$(TARGET)
+ LD = @LD@
+-LDFLAGS =  $(ODBC_LIB) $(EI_LDFLAGS)
++LDFLAGS = @LDFLAGS@ $(ODBC_LIB) $(EI_LDFLAGS)
+ LIBS = @LIBS@ @THR_LIBS@ $(EI_LIB)
+ INCLUDES = -I. $(ODBC_INCLUDE) $(EI_INCLUDE)
+ TARGET_FLAGS =  @TARGET_FLAGS@
Index: pkgsrc/lang/erlang/patches/patch-make_otp.mk.in
diff -u /dev/null pkgsrc/lang/erlang/patches/patch-make_otp.mk.in:1.1
--- /dev/null   Thu Nov  2 19:20:46 2023
+++ pkgsrc/lang/erlang/patches/patch-make_otp.mk.in     Thu Nov  2 19:20:46 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-make_otp.mk.in,v 1.1 2023/11/02 19:20:46 adam Exp $
+
+Build all .java files.
+
+--- make/otp.mk.in.orig        2013-02-25 19:21:31.000000000 +0000
++++ make/otp.mk.in
+@@ -195,7 +195,7 @@ endif
+ 
+ 
+ $(JAVA_DEST_ROOT)$(JAVA_CLASS_SUBDIR)%.class: %.java
+-      $(javac_verbose)CLASSPATH=$(CLASSPATH) $(JAVA) $(JAVA_OPTIONS) -d $(JAVA_DEST_ROOT) $<
++      $(javac_verbose)CLASSPATH=$(CLASSPATH) $(JAVA) $(JAVA_OPTIONS) -d $(JAVA_DEST_ROOT) *.java
+ 
+ # ----------------------------------------------------
+ #     Emacs byte code compiling

Index: pkgsrc/lang/erlang/patches/patch-lib_runtime__tools_c__src_Makefile.in
diff -u /dev/null pkgsrc/lang/erlang/patches/patch-lib_runtime__tools_c__src_Makefile.in:1.3
--- /dev/null   Thu Nov  2 19:20:46 2023
+++ pkgsrc/lang/erlang/patches/patch-lib_runtime__tools_c__src_Makefile.in      Thu Nov  2 19:20:46 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_runtime__tools_c__src_Makefile.in,v 1.3 2023/11/02 19:20:46 adam Exp $
+
+Properly install shared objects.
+
+--- lib/runtime_tools/c_src/Makefile.in.orig   2023-11-02 14:43:42.856434868 +0000
++++ lib/runtime_tools/c_src/Makefile.in
+@@ -110,7 +110,7 @@ include $(ERL_TOP)/make/otp_release_targ
+ 
+ release_spec: opt
+       $(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
+-      $(INSTALL_PROGRAM) $(TRACE_LIBS) "$(RELSYSDIR)/priv/lib"
++      ${BSD_INSTALL_LIB} $(TRACE_LIBS) "$(RELSYSDIR)/priv/lib"
+ 
+ release_docs_spec:
+

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/net/rabbitmq
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/net/rabbitmq
Indexes:

Home | Main Index | Thread Index | Old Index