Attachment 253502 Details for Bug 281440 – [patch] address newer lld changes which choke on undefined symbols listed in linker scripts (--version-script)

[patch] [patch] address newer lld changes which choke on undefined symbols listed in linker scripts (--version-script)

pr-libtasn1-fix--version-script.diff (text/plain), 4.28 KB, created by John Hein on 2024-09-11 18:27:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2024-09-11 18:27:54 UTC

Size: 4.28 KB

patch

obsolete

>see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=281440
>
>Change original patch [[1]] to doc/reference/Makefile.in to apply to
>the source (gtk-doc.make) since it is now regenerated at configure time
>(blowing away the patched version of Makefile.in).  I kept the patch for
>Makefile.in, but it's not really needed anymore.
>
>[[1]] The original Makefile.in patch is there because make(1) can act
>differently with meke -B (single shell per command) and make -j N,
>especially when something like 'cd' is involved. As recommended in
>make(1), use a subshell in this case - make implementations can vary.
>
>diff --git a/security/libtasn1/Makefile b/security/libtasn1/Makefile
>index c7118262b4c7..76220f9eea46 100644
>--- a/security/libtasn1/Makefile
>+++ b/security/libtasn1/Makefile
>@@ -13,7 +13,7 @@ LICENSE=	LGPL21+ GPLv3
> LICENSE_COMB=	multi
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		cpe libtool pathfix pkgconfig
>+USES=		autoreconf cpe libtool pathfix pkgconfig
> USE_CSTD=	c99
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
>diff --git a/security/libtasn1/files/patch-doc_reference_Makefile.in b/security/libtasn1/files/patch-doc_reference_Makefile.in
>index 173517bf074f..1315e698e89c 100644
>--- a/security/libtasn1/files/patch-doc_reference_Makefile.in
>+++ b/security/libtasn1/files/patch-doc_reference_Makefile.in
>@@ -1,11 +1,11 @@
>---- doc/reference/Makefile.in.orig	2021-11-13 05:59:58 UTC
>+--- doc/reference/Makefile.in.orig	2022-08-23 17:32:13 UTC
> +++ doc/reference/Makefile.in
>-@@ -1840,7 +1840,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(c
>- 	  test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file $(abs_builddir)/html; \
>- 	  test -f $$file && cp $$file $(abs_builddir)/html; \
>- 	done;
>--	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
>-+	cd "$(abs_srcdir)" && $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
>- 	$(AM_V_at)touch html-build.stamp
>- 
>- pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files)
>+@@ -1866,7 +1866,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(c
>+ 	if test "$$?" = "0"; then \
>+ 	  mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
>+ 	fi; \
>+-	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
>++	(cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE))
>+ 	-@test "x$(HTML_IMAGES)" = "x" || \
>+ 	for file in $(HTML_IMAGES) ; do \
>+ 	  test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
>diff --git a/security/libtasn1/files/patch-gtk-doc.make b/security/libtasn1/files/patch-gtk-doc.make
>new file mode 100644
>index 000000000000..dc24b5296f74
>--- /dev/null
>+++ b/security/libtasn1/files/patch-gtk-doc.make
>@@ -0,0 +1,11 @@
>+--- gtk-doc.make.orig	2024-09-11 15:56:09 UTC
>++++ gtk-doc.make
>+@@ -208,7 +208,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(c
>+ 	if test "$$?" = "0"; then \
>+ 	  mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \
>+ 	fi; \
>+-	cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
>++	(cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE))
>+ 	-@test "x$(HTML_IMAGES)" = "x" || \
>+ 	for file in $(HTML_IMAGES) ; do \
>+ 	  test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
>diff --git a/security/libtasn1/files/patch-m4_ld-version-script.m4 b/security/libtasn1/files/patch-m4_ld-version-script.m4
>new file mode 100644
>index 000000000000..636719025ad7
>--- /dev/null
>+++ b/security/libtasn1/files/patch-m4_ld-version-script.m4
>@@ -0,0 +1,15 @@
>+--- m4/ld-version-script.m4.orig	2022-08-23 17:31:40 UTC
>++++ m4/ld-version-script.m4
>+@@ -39,7 +39,11 @@ VERS_2 {
>+ } VERS_1;
>+ EOF
>+            AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
>+-             [gl_cv_sys_ld_version_script=yes])])
>++             [gl_cv_sys_ld_version_script=yes],
>++             [LDFLAGS="$LDFLAGS -Wl,--undefined-version"
>++              AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
>++                [gl_cv_sys_ld_version_script=yes])
>++             ])])
>+         rm -f conftest.map
>+         LDFLAGS=$save_LDFLAGS])
>+      have_ld_version_script=$gl_cv_sys_ld_version_script])

Actions: View | Diff

Attachments on bug 281440: 253502