vorbis-tools: don't nest .a-files; ld(1) from latest xcode chokes on it

This commit is contained in:
tnn 2022-09-13 10:56:36 +00:00
parent 856eef37d5
commit 98d72b50ee
2 changed files with 27 additions and 1 deletions

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.31 2022/03/26 21:33:47 tnn Exp $
$NetBSD: distinfo,v 1.32 2022/09/13 10:56:36 tnn Exp $
BLAKE2s (vorbis-tools-1.4.2.tar.gz) = cefdc1b09753f242c4ca59cb47b3451a1946b9527759e0685eeabeb211c5d3f9
SHA512 (vorbis-tools-1.4.2.tar.gz) = 31681560434054706981aef64406975295eb405a9d2d7c0468af789d6c23edb7cfc1c19d26a28fa7061835524289cdc6d217a4669c43a2eb828189370cc6fcaf
@ -8,3 +8,4 @@ SHA1 (patch-ab) = 00c0a5a9388baf79fd944e12cda1da65e2e8676c
SHA1 (patch-ae) = 60ca36c35325e4228ea7f7f5b3a60cd57b56b0cd
SHA1 (patch-configure) = ede9f755ae5d125325da50948d54367ae6c30d7b
SHA1 (patch-ogg123_status.c) = 906cf9a5a19afc69cdafdf7d9f98f79072553520
SHA1 (patch-share_Makefile.in) = 0ee4b3d2289c5fe89cecfed8257fb0ae07da2b9f

View file

@ -0,0 +1,25 @@
$NetBSD: patch-share_Makefile.in,v 1.1 2022/09/13 10:56:36 tnn Exp $
Don't nest .a-files; ld(1) from latest xcode chokes on it.
For libpicture.a, use base64.o directly instead of libbase64.a.
--- share/Makefile.in.orig 2021-01-21 09:14:19.000000000 +0000
+++ share/Makefile.in
@@ -131,7 +131,7 @@ libgetopt_a_LIBADD =
am_libgetopt_a_OBJECTS = getopt.$(OBJEXT) getopt1.$(OBJEXT)
libgetopt_a_OBJECTS = $(am_libgetopt_a_OBJECTS)
libpicture_a_AR = $(AR) $(ARFLAGS)
-libpicture_a_DEPENDENCIES = libbase64.a
+libpicture_a_DEPENDENCIES = base64.$(OBJEXT)
am_libpicture_a_OBJECTS = picture.$(OBJEXT)
libpicture_a_OBJECTS = $(am_libpicture_a_OBJECTS)
libutf8_a_AR = $(AR) $(ARFLAGS)
@@ -407,7 +407,7 @@ libutf8_a_SOURCES = charset.c charset.h
libgetopt_a_SOURCES = getopt.c getopt1.c
libbase64_a_SOURCES = base64.c
libpicture_a_SOURCES = picture.c
-libpicture_a_LIBADD = libbase64.a
+libpicture_a_LIBADD = base64.$(OBJEXT)
EXTRA_DIST = charmaps.h makemap.c charset_test.c charsetmap.h
all: all-am