Skip to content

Commit

Permalink
icoutils: fix build with Ventura (at least)
Browse files Browse the repository at this point in the history
the linker does not appear to accept one static archive
being wholly embedded into another.

in this case, embedding libgnu.a into libcommon.a was
unnecessary anyway, as the two libraries are always included
individually when linked in.

closes: https://trac.macports.org/ticket/66084
  • Loading branch information
kencu committed Oct 28, 2022
1 parent 6fbbb38 commit b18a52f
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 0 deletions.
3 changes: 3 additions & 0 deletions graphics/icoutils/Portfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ use_bzip2 yes

patchfiles patch-lib-error.c.diff

# https://trac.macports.org/ticket/66084
patchfiles-append patch-icoutils-remove-libgnu-from-libcommon.diff

depends_lib port:libpng
depends_run port:perl${perl5.major} \
port:p${perl5.major}-libwww-perl
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
--- common/Makefile.in.orig 2022-10-27 20:27:42
+++ common/Makefile.in 2022-10-27 20:29:00
@@ -154,7 +154,6 @@
am__v_AR_0 = @echo " AR " $@;
am__v_AR_1 =
libcommon_a_AR = $(AR) $(ARFLAGS)
-libcommon_a_DEPENDENCIES = ../lib/libgnu.a
am_libcommon_a_OBJECTS = error.$(OBJEXT) hmap.$(OBJEXT) \
io-utils.$(OBJEXT) intutil.$(OBJEXT) llist.$(OBJEXT) \
strbuf.$(OBJEXT) string-utils.$(OBJEXT) tmap.$(OBJEXT)
@@ -1023,9 +1022,6 @@
string-utils.h \
tmap.c \
tmap.h
-
-libcommon_a_LIBADD = \
- ../lib/libgnu.a

AM_CPPFLAGS = \
-I$(top_builddir)/lib \

0 comments on commit b18a52f

Please sign in to comment.