Attachment 223804 Details for Bug 254704 – patch to update erlang-runtime23 to 23.3.1, fix ODBC option, and updates wxWidgets to 3.0

[patch] patch to update erlang-runtime23 to 23.3.1, fix ODBC option, and updates wxWidgets to 3.0

erlang-runtime23.diff (text/plain), 3.08 KB, created by Kim Shrier on 2021-04-04 16:20:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kim Shrier

Created: 2021-04-04 16:20:51 UTC

Size: 3.08 KB

patch

obsolete

>diff -ruN erlang-runtime23.orig/Makefile erlang-runtime23/Makefile
>--- erlang-runtime23.orig/Makefile	2021-03-03 03:53:50.000000000 -0700
>+++ erlang-runtime23/Makefile	2021-04-03 18:15:36.091190000 -0600
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	erlang
> DISTVERSIONPREFIX=	OTP-
>-DISTVERSION=	23.2.7
>+DISTVERSION=	23.3.1
> CATEGORIES=	lang parallel java
> PKGNAMESUFFIX=	-runtime23
> DIST_SUBDIR=	erlang
>@@ -19,7 +19,7 @@
> USE_GITHUB=	nodefault
> GH_ACCOUNT=	erlang:otp,corba
> GH_PROJECT=	otp:otp corba:corba
>-GH_TAGNAME=	5.0:corba
>+GH_TAGNAME=	5.0.1:corba
> USE_PERL5=	build
> 
> DATADIR=        ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
>@@ -77,13 +77,14 @@
> NATIVE_CONFIGURE_ENABLE=native-libs
> ODBC_CONFIGURE_WITH=	odbc
> ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
>+ODBC_LDFLAGS=		-L/usr/local/lib
> OPENSSL_CONFIGURE_WITH=	ssl=${OPENSSLBASE}
> OPENSSL_USES=		ssl
> SCTP_CONFIGURE_ENABLE=	sctp
> THREADS_CONFIGURE_ENABLE=	threads
> WX_CONFIGURE_WITH=	wx-config=${WX_CONFIG}
> WX_USES=		gl
>-WX_VARS=		USE_WX=2.8+ WX_COMPS="wx contrib" USE_GL="gl glu"
>+WX_VARS=		USE_WX=3.0+ WX_COMPS="wx" USE_GL="gl glu"
> 
> .include <bsd.port.pre.mk>
> 
>diff -ruN erlang-runtime23.orig/distinfo erlang-runtime23/distinfo
>--- erlang-runtime23.orig/distinfo	2021-03-03 03:53:50.000000000 -0700
>+++ erlang-runtime23/distinfo	2021-03-30 18:35:02.279888000 -0600
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1614764973
>-SHA256 (erlang/erlang-otp-OTP-23.2.7_GH0.tar.gz) = db84414c42ef5c9d472ddf780cad6f210c2344b22ecd59ca57527bf043ea0943
>-SIZE (erlang/erlang-otp-OTP-23.2.7_GH0.tar.gz) = 56600356
>-SHA256 (erlang/erlang-corba-5.0_GH0.tar.gz) = c4daf7c89cc8853e0965d03d360ebb643fa7c407ca81483046deb2f33f981f3e
>-SIZE (erlang/erlang-corba-5.0_GH0.tar.gz) = 1394244
>+TIMESTAMP = 1617150843
>+SHA256 (erlang/erlang-otp-OTP-23.3.1_GH0.tar.gz) = a5a067a3b17bbef8511f2c056957925b666670b6f2cdaf645e1bc28ce3dd3517
>+SIZE (erlang/erlang-otp-OTP-23.3.1_GH0.tar.gz) = 56654422
>+SHA256 (erlang/erlang-corba-5.0.1_GH0.tar.gz) = 5e050376e51bd414d07d96018ba746487a652fbb39934f99a0cefb6439df6247
>+SIZE (erlang/erlang-corba-5.0.1_GH0.tar.gz) = 1395153
>diff -ruN erlang-runtime23.orig/files/patch-lib_odbc_configure.in erlang-runtime23/files/patch-lib_odbc_configure.in
>--- erlang-runtime23.orig/files/patch-lib_odbc_configure.in	1969-12-31 17:00:00.000000000 -0700
>+++ erlang-runtime23/files/patch-lib_odbc_configure.in	2021-04-03 12:48:02.471828000 -0600
>@@ -0,0 +1,18 @@
>+--- lib/odbc/configure.in.orig	2021-03-29 07:15:57.000000000 -0600
>++++ lib/odbc/configure.in	2021-03-31 00:28:03.147674000 -0600
>+@@ -111,6 +111,7 @@
>+ AC_HEADER_STDC
>+ AC_CHECK_HEADERS([fcntl.h netdb.h stdlib.h string.h sys/socket.h winsock2.h])
>+ AC_CHECK_HEADERS([windows.h])
>++CFLAGS+=" -I/usr/local/include"
>+ AC_CHECK_HEADERS([sql.h sqlext.h], [odbc_required_headers=yes], [odbc_required_headers=no],
>+ [[#ifdef HAVE_WINDOWS_H
>+      # include <windows.h>
>+@@ -208,6 +209,7 @@
>+ 			    echo "No odbc library found" > "$ERL_TOP/lib/odbc/SKIP"
>+ 			else
>+ 			    AC_MSG_RESULT($ODBC_LIB)
>++                            LDFLAGS+=" $ODBC_LIB"
>+ 			    AC_CHECK_LIB(odbc, SQLAllocHandle,[ODBC_LIB="$ODBC_LIB -lodbc"; odbc_lib_link_success=yes])
>+ 			fi
>+ 			;;

Actions: View | Diff

Attachments on bug 254704: 223759 | 223804