Attachment 239584 Details for Bug 269048 – [patch] fix build if devel/uthash installed; unbreak SIGNATURES; use libfetch instead of libcurl, etc.

[patch] [patch] fix build if devel/uthash installed; unbreak SIGNATURES; use libfetch instead of libcurl, etc.

pr-ucl-libfetch+uthash-fix+unbreak-sig.diff (text/plain), 2.66 KB, created by John Hein on 2023-01-19 09:15:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2023-01-19 09:15:41 UTC

Size: 2.66 KB

patch

obsolete

>diff --git a/textproc/libucl/Makefile b/textproc/libucl/Makefile
>index d1c40935caa2..d66cad665fe6 100644
>--- a/textproc/libucl/Makefile
>+++ b/textproc/libucl/Makefile
>@@ -19,11 +19,13 @@ USE_LDCONFIG=	yes
> 
> GNU_CONFIGURE=	yes
> 
>-CONFLICTS_INSTALL=	ucl
>-
> INSTALL_TARGET=	install-strip
> TEST_TARGET=	check
> 
>+CPPFLAGS=		-I../uthash
>+
>+CONFLICTS_INSTALL=	ucl
>+
> OPTIONS_DEFINE=		LUA REGEX SIGNATURES URLS UTILS
> OPTIONS_DEFAULT=	REGEX UTILS
> OPTIONS_SUB=		yes
>@@ -49,11 +51,4 @@ URLS_CONFIGURE_ENABLE=	urls
> 
> UTILS_CONFIGURE_ENABLE=	utils
> 
>-.include <bsd.port.options.mk>
>-
>-# https://github.com/vstakhov/libucl/issues/203
>-.if ${PORT_OPTIONS:MSIGNATURES} && ((${OPSYS} == FreeBSD && ${SSL_DEFAULT} == base) || ${SSL_DEFAULT} == openssl)
>-BROKEN=	Signatures checking support does not build with OpenSSL 1.1.1
>-.endif
>-
> .include <bsd.port.mk>
>diff --git a/textproc/py-ucl/Makefile b/textproc/py-ucl/Makefile
>index 3b72d8953076..fa84ee5d6b02 100644
>--- a/textproc/py-ucl/Makefile
>+++ b/textproc/py-ucl/Makefile
>@@ -10,17 +10,16 @@ WWW=		https://github.com/vstakhov/libucl/
> LICENSE=	MIT
> LICENSE_FILE=	${WRKDIR}/libucl-${PORTVERSION}/COPYING
> 
>-LIB_DEPENDS=	libcurl.so:ftp/curl \
>-	libucl.so:textproc/libucl
>+LIB_DEPENDS=	libucl.so:textproc/libucl
> 
>-CFLAGS+=	-I${PREFIX}/include
>-
>-USES=		python:3.6+
>+USES=		python
> USE_GITHUB=	yes
> GH_ACCOUNT=	vstakhov
> GH_PROJECT=	libucl
> USE_PYTHON=	autoplist concurrent distutils
> 
>+CPPFLAGS+=	-Iuthash
>+
> WRKSRC_SUBDIR=	python
> 
> .include <bsd.port.mk>
>diff --git a/textproc/py-ucl/files/patch-setup.py b/textproc/py-ucl/files/patch-setup.py
>new file mode 100644
>index 000000000000..30e9442ceb73
>--- /dev/null
>+++ b/textproc/py-ucl/files/patch-setup.py
>@@ -0,0 +1,29 @@
>+--- setup.py.orig	2023-01-08 10:03:32 UTC
>++++ setup.py
>+@@ -22,7 +22,7 @@ if sys.version < '2.7':
>+ 
>+ uclmodule = Extension(
>+     'ucl',
>+-    libraries=['ucl', 'curl'],
>++    libraries=['ucl', 'fetch'],
>+     sources=['python/src/uclmodule.c'],
>+     include_dirs=['include'],
>+     language='c',
>+@@ -31,7 +31,7 @@ uclmodule = Extension(
>+ ucl_lib = {
>+     'sources': ['src/' + fn for fn in os.listdir('src') if fn.endswith('.c')],
>+     'include_dirs': ['include', 'src', 'uthash', 'klib'],
>+-    'macros': [('CURL_FOUND', '1')],
>++    'macros': [('HAVE_FETCH_H', '1')],
>+ }
>+ 
>+ # sdist setup() will pull in the *.c files automatically, but not headers
>+@@ -41,7 +41,7 @@ template = 'python/MANIFEST.in'
>+ # distutils assume setup.py is in the root of the project
>+ # we need to include C source from the parent so trick it
>+ in_ucl_root = 'setup.py' in os.listdir('python')
>+-if in_ucl_root:
>++if not os.path.isfile('setup.py') and in_ucl_root:
>+     os.link('python/setup.py', 'setup.py')
>+ 
>+ setup(

Flags:

jcfyecrayz: maintainer-approval? (bofh)

Actions: View | Diff

Attachments on bug 269048: 239584