tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[PATCH] devel/readline: more proper libtool usage; specify --tag=CC



Hi,

I am currently battling with a situation where libtool fails to infer
the correct tag for builds. A cause seems to be that CC=cc for me and
it would work with CC=gcc. I cannot even reproduce builds that worked
before (readline from 2015Q4 on CentOS 7 base, which has been upgraded
to 7.3 in the meantime), they fail with readline complaining about
unknown tag.

While there will be the root cause of this to be found and fixed so
that CC=gcc for my pkgsrc builds with gcc, libtool documentation
clearly recommends being explicit in Makefiles. Hence, I am suggesting
the attached patch to the patch in pkgsrc that adds libtool-using
targets to readline. When we add libtool stuff, we should do it
properly with --tag=CC.

Any hints regarding why CC=cc happens instead of CC=gcc (which must
have happened sometime in the past as I used to be able to build
readline!) are welcome anyway.


Alrighty then,

Thomas

-- 
Dr. Thomas Orgis
Universität Hamburg
RRZ / Basis-Infrastruktur / HPC
Schlüterstr. 70
20146 Hamburg
Tel.: 040/42838 8826
Fax: 040/428 38 6270
Index: devel/readline/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/readline/distinfo,v
retrieving revision 1.28
diff -u -r1.28 distinfo
--- devel/readline/distinfo	20 Nov 2016 01:14:21 -0000	1.28
+++ devel/readline/distinfo	4 Oct 2017 09:33:15 -0000
@@ -4,8 +4,8 @@
 RMD160 (readline-7.0.tar.gz) = 745bfdddd989fe46c55eea1b41cae7848c3bf2e0
 SHA512 (readline-7.0.tar.gz) = 18243189d39bf0d4c8a76cddcce75243c1bae8824c686e9b6ba352667607e5b10c5feb79372a1093c1c388d821841670702e940df12eae94bcebdeed90047870
 Size (readline-7.0.tar.gz) = 2910016 bytes
-SHA1 (patch-ae) = d76f0887b2cbb2bb08c5a123397d05e0fbbe2acf
+SHA1 (patch-ae) = ee6e4fe7e5f8905d4d4ffb06a5eeb067fe51da86
 SHA1 (patch-ag) = 3114e6959dfff3e2aae74c3df3ba4b0f692b79bb
 SHA1 (patch-ah) = d812ea068415939beb42c72dd9bed8d210db57d1
 SHA1 (patch-colors.c) = beb4cdb33e1b361804a7d8d3b36dbd137e7502fd
-SHA1 (patch-examples_Makefile.in) = 406e208ca140cab4bd34a1aabe63e2c05dacc924
+SHA1 (patch-examples_Makefile.in) = bddb811f74824edaf3b20a8dde7c7a2bdbf47eb4
Index: devel/readline/patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/devel/readline/patches/patch-ae,v
retrieving revision 1.18
diff -u -r1.18 patch-ae
--- devel/readline/patches/patch-ae	20 Nov 2016 01:14:21 -0000	1.18
+++ devel/readline/patches/patch-ae	4 Oct 2017 09:33:15 -0000
@@ -33,7 +33,7 @@
 +.SUFFIXES: .lo
 +.c.lo:
 +	${RM} $@
-+	$(LIBTOOL) --mode=compile $(CC) -c $(CCFLAGS) $<
++	$(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(CCFLAGS) $<
 +
  # The name of the main library target.
  LIBRARY_NAME = libreadline.a
@@ -60,7 +60,7 @@
  
 +libreadline.la: $(OBJECTS:.o=.lo)
 +	$(LIBTOOL) --mode=clean $(RM) $@
-+	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS:.o=.lo) $(TERMCAP_LIB) \
++	$(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $(OBJECTS:.o=.lo) $(TERMCAP_LIB) \
 +		-rpath $(libdir) -version-info $(SHLIB_MAJOR):$(SHLIB_MINOR) \
 +		$(LDFLAGS)
 +
@@ -71,7 +71,7 @@
  
 +libhistory.la: $(HISTOBJ:.o=.lo) xmalloc.lo xfree.lo
 +	$(LIBTOOL) --mode=clean $(RM) $@
-+	$(LIBTOOL) --mode=link $(CC) -o $@ $(HISTOBJ:.o=.lo) xmalloc.lo xfree.lo \
++	$(LIBTOOL) --mode=link --tag=CC $(CC) -o $@ $(HISTOBJ:.o=.lo) xmalloc.lo xfree.lo \
 +		-rpath $(libdir) -version-info $(SHLIB_MAJOR):$(SHLIB_MINOR) \
 +		$(LDFLAGS)
 +
@@ -83,7 +83,7 @@
  
 +tilde.lo:	tilde.c
 +	$(LIBTOOL) --mode=clean rm -f $@
-+	$(LIBTOOL) --mode=compile $(CC) $(CCFLAGS) -DREADLINE_LIBRARY -c $(srcdir)/tilde.c
++	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(CCFLAGS) -DREADLINE_LIBRARY -c $(srcdir)/tilde.c
 +
  readline: $(OBJECTS) readline.h rldefs.h chardefs.h ./libreadline.a
  	$(CC) $(CCFLAGS) -DREADLINE_LIBRARY -o $@ $(top_srcdir)/examples/rl.c ./libreadline.a ${TERMCAP_LIB}
Index: devel/readline/patches/patch-examples_Makefile.in
===================================================================
RCS file: /cvsroot/pkgsrc/devel/readline/patches/patch-examples_Makefile.in,v
retrieving revision 1.4
diff -u -r1.4 patch-examples_Makefile.in
--- devel/readline/patches/patch-examples_Makefile.in	20 Nov 2016 01:14:21 -0000	1.4
+++ devel/readline/patches/patch-examples_Makefile.in	4 Oct 2017 09:33:15 -0000
@@ -12,8 +12,8 @@
  
  DEFS = @DEFS@
 -CC = @CC@
-+REALCC = $(LIBTOOL) --mode=compile @CC@
-+CC = $(LIBTOOL) --mode=link @CC@
++REALCC = $(LIBTOOL) --mode=compile --tag=CC @CC@
++CC = $(LIBTOOL) --mode=link --tag=CC @CC@
  CFLAGS = @CFLAGS@
  LOCAL_CFLAGS = @LOCAL_CFLAGS@ -DREADLINE_LIBRARY -DRL_LIBRARY_VERSION='"$(RL_LIBRARY_VERSION)"'
  CPPFLAGS = @CPPFLAGS@

Attachment: smime.p7s
Description: S/MIME cryptographic signature



Home | Main Index | Thread Index | Old Index