INN commit: trunk (8 files)

INN Commit rra at isc.org
Tue Jan 5 15:07:06 UTC 2021


    Date: Tuesday, January 5, 2021 @ 07:07:06
  Author: iulius
Revision: 10495

Do not use Libtool when no library is expected

Revert r10415 which was inappropriate.  Libtool should not be used
to compile C files not aimed at forming part of shared libraries.
It notably broke the build on AIX (only PIC objects were generated
and linking for creating a PIE executable failed).

Modified:
  trunk/authprogs/Makefile
  trunk/frontends/Makefile
  trunk/innd/Makefile
  trunk/innfeed/Makefile
  trunk/lib/Makefile
  trunk/nnrpd/Makefile
  trunk/storage/Makefile
  trunk/tests/Makefile

--------------------+
 authprogs/Makefile |    4 ++--
 frontends/Makefile |    8 ++++----
 innd/Makefile      |    6 +++---
 innfeed/Makefile   |    2 +-
 lib/Makefile       |    2 +-
 nnrpd/Makefile     |    6 +++---
 storage/Makefile   |    2 +-
 tests/Makefile     |   36 ++++++++++++++++++------------------
 8 files changed, 33 insertions(+), 33 deletions(-)

Modified: authprogs/Makefile
===================================================================
--- authprogs/Makefile	2021-01-05 12:53:48 UTC (rev 10494)
+++ authprogs/Makefile	2021-01-05 15:07:06 UTC (rev 10495)
@@ -59,10 +59,10 @@
 	$(LINK) radius.o $(AUTH_LIBS)
 
 auth_krb5.o: auth_krb5.c
-	$(LIBCC) $(CFLAGS) $(KRB5_CPPFLAGS) -c auth_krb5.c
+	$(CC) $(CFLAGS) $(KRB5_CPPFLAGS) -c auth_krb5.c
 
 ckpasswd.o: ckpasswd.c
-	$(LIBCC) $(CFLAGS) $(DBM_CPPFLAGS) -c ckpasswd.c
+	$(CC) $(CFLAGS) $(DBM_CPPFLAGS) -c ckpasswd.c
 
 $(LIBINN):	; (cd ../lib ; $(MAKE))
 $(LIBSTORAGE):	; (cd ../storage ; $(MAKE))

Modified: frontends/Makefile
===================================================================
--- frontends/Makefile	2021-01-05 12:53:48 UTC (rev 10494)
+++ frontends/Makefile	2021-01-05 15:07:06 UTC (rev 10495)
@@ -93,16 +93,16 @@
 	$(LINKDEPS) sm.o           $(STORELIBS)
 
 ovdb_init.o: ovdb_init.c
-	$(LIBCC) $(CFLAGS) $(BDB_CPPFLAGS) -c $<
+	$(CC) $(CFLAGS) $(BDB_CPPFLAGS) -c $<
 
 ovdb_monitor.o: ovdb_monitor.c
-	$(LIBCC) $(CFLAGS) $(BDB_CPPFLAGS) -c $<
+	$(CC) $(CFLAGS) $(BDB_CPPFLAGS) -c $<
 
 ovdb_server.o: ovdb_server.c
-	$(LIBCC) $(CFLAGS) $(BDB_CPPFLAGS) -c $<
+	$(CC) $(CFLAGS) $(BDB_CPPFLAGS) -c $<
 
 ovdb_stat.o: ovdb_stat.c
-	$(LIBCC) $(CFLAGS) $(BDB_CPPFLAGS) -c $<
+	$(CC) $(CFLAGS) $(BDB_CPPFLAGS) -c $<
 
 cnfsheadconf:	cnfsheadconf.in  $(FIX)	; $(FIX) cnfsheadconf.in
 cnfsstat:	cnfsstat.in      $(FIX)	; $(FIX) cnfsstat.in

Modified: innd/Makefile
===================================================================
--- innd/Makefile	2021-01-05 12:53:48 UTC (rev 10494)
+++ innd/Makefile	2021-01-05 15:07:06 UTC (rev 10495)
@@ -3,7 +3,7 @@
 include ../Makefile.global
 
 top	        = ..
-CFLAGS		= $(GCFLAGS) $(TCLINC) $(SYSTEMD_CFLAGS)
+CFLAGS		= $(GCFLAGS) $(SYSTEMD_CFLAGS)
 
 ALL		= innd tinyleaf
 
@@ -37,8 +37,8 @@
 		  $(SYSTEMD_LIBS) \
 		  $(PERL_LIBS) $(PYTHON_LIBS) $(REGEX_LIBS) $(LIBS)
 
-perl.o:		perl.c   ; $(LIBCC) $(CFLAGS) $(PERL_CPPFLAGS) -c perl.c
-python.o:	python.c ; $(LIBCC) $(CFLAGS) $(PYTHON_CPPFLAGS) -c python.c
+perl.o:		perl.c   ; $(CC) $(CFLAGS) $(PERL_CPPFLAGS) -c perl.c
+python.o:	python.c ; $(CC) $(CFLAGS) $(PYTHON_CPPFLAGS) -c python.c
 
 innd: $(OBJECTS) $(LIBSTORAGE) $(LIBHIST) $(LIBINN)
 	$(LIBLD) $(LDFLAGS) -o $@ $(OBJECTS) $(INNDLIBS)

Modified: innfeed/Makefile
===================================================================
--- innfeed/Makefile	2021-01-05 12:53:48 UTC (rev 10494)
+++ innfeed/Makefile	2021-01-05 15:07:06 UTC (rev 10495)
@@ -64,7 +64,7 @@
 	mv lex.yy.c config_l.c
 
 imap_connection.o: imap_connection.c
-	$(LIBCC) $(CFLAGS) $(SASL_CPPFLAGS) -c $<
+	$(CC) $(CFLAGS) $(SASL_CPPFLAGS) -c $<
 
 innfeed: $(OBJECTS) connection.o $(LIBSTORAGE) $(LIBINN)
 	$(LIBLD) $(LDFLAGS) -o $@ $(OBJECTS) connection.o $(INNFEEDLIBS)

Modified: lib/Makefile
===================================================================
--- lib/Makefile	2021-01-05 12:53:48 UTC (rev 10494)
+++ lib/Makefile	2021-01-05 15:07:06 UTC (rev 10495)
@@ -67,7 +67,7 @@
 	$(LIBCC) $(CFLAGS) -c $*.c
 
 perl.o: perl.c
-	$(LIBCC) $(CFLAGS) $(PERL_CPPFLAGS) -c perl.c
+	$(CC) $(CFLAGS) $(PERL_CPPFLAGS) -c perl.c
 
 ../include/inn/system.h:
 	(cd ../include && $(MAKE))

Modified: nnrpd/Makefile
===================================================================
--- nnrpd/Makefile	2021-01-05 12:53:48 UTC (rev 10494)
+++ nnrpd/Makefile	2021-01-05 15:07:06 UTC (rev 10495)
@@ -38,10 +38,10 @@
 		  $(ZLIB_LDFLAGS) $(ZLIB_LIBS) $(LIBS)
 
 .c.o:
-	$(LIBCC) $(CFLAGS) -c $<
+	$(CC) $(CFLAGS) -c $<
 
-perl.o:		perl.c   ; $(LIBCC) $(CFLAGS) $(PERL_CPPFLAGS) -c perl.c
-python.o:	python.c ; $(LIBCC) $(CFLAGS) $(PYTHON_CPPFLAGS) -c python.c
+perl.o:		perl.c   ; $(CC) $(CFLAGS) $(PERL_CPPFLAGS) -c perl.c
+python.o:	python.c ; $(CC) $(CFLAGS) $(PYTHON_CPPFLAGS) -c python.c
 
 nnrpd: $(OBJECTS) $(LIBHIST) $(LIBSTORAGE) $(LIBINN)
 	$(LIBLD) $(LDFLAGS) -o $@ $(OBJECTS) $(NNRPDLIBS)

Modified: storage/Makefile
===================================================================
--- storage/Makefile	2021-01-05 12:53:48 UTC (rev 10494)
+++ storage/Makefile	2021-01-05 15:07:06 UTC (rev 10495)
@@ -84,7 +84,7 @@
 	$(LIBCC) $(CFLAGS) $(CCOUTPUT)
 
 ovtest:	ov.c libstorage.$(EXTLIB) $(LIBINN)
-	$(LIBCC) $(CFLAGS) -D_TEST_ -o ovtest ov.c \
+	$(CC) $(CFLAGS) -D_TEST_ -o ovtest ov.c \
 	    libstorage.$(EXTLIB) $(LIBINN) $(STORAGE_LIBS) $(LIBS)
 
 $(LIBINN):      ; (cd ../lib ; $(MAKE))

Modified: tests/Makefile
===================================================================
--- tests/Makefile	2021-01-05 12:53:48 UTC (rev 10494)
+++ tests/Makefile	2021-01-05 15:07:06 UTC (rev 10495)
@@ -52,7 +52,7 @@
 	@exit 1
 
 .c.o:
-	$(LIBCC) $(CFLAGS) -c -o $@ $*.c
+	$(CC) $(CFLAGS) -c -o $@ $*.c
 
 LINK		= $(LIBLD) $(LDFLAGS) $(BDB_LDFLAGS) $(SSL_LDFLAGS) $(SASL_LDFLAGS) $(KRB5_LDFLAGS) -o $@
 LINKDEPS	= $(LIBLDDEPS) $(LDFLAGS) $(BDB_LDFLAGS) $(SSL_LDFLAGS) $(SASL_LDFLAGS) $(KRB5_LDFLAGS) -o $@
@@ -91,7 +91,7 @@
 	$(LINK) innd/chan-t.o innd/fakeinnd.o tap/basic.o $(INNOBJS) $(INNDLIBS)
 
 lib/asprintf.o: ../lib/asprintf.c
-	$(LIBCC) $(CFLAGS) -DTESTING -c -o $@ ../lib/asprintf.c
+	$(CC) $(CFLAGS) -DTESTING -c -o $@ ../lib/asprintf.c
 
 lib/asprintf.t: lib/asprintf.o lib/asprintf-t.o tap/basic.o $(LIBINN)
 	$(LINK) lib/asprintf.o lib/asprintf-t.o tap/basic.o $(LIBINN) $(LIBS)
@@ -119,7 +119,7 @@
 	$(LINK) lib/fdflag-t.o tap/basic.o $(LIBINN) $(LIBS)
 
 lib/getaddrinfo.o: ../lib/getaddrinfo.c
-	$(LIBCC) $(CFLAGS) -DTESTING -c -o $@ ../lib/getaddrinfo.c
+	$(CC) $(CFLAGS) -DTESTING -c -o $@ ../lib/getaddrinfo.c
 
 lib/getaddrinfo.t: lib/getaddrinfo.o lib/getaddrinfo-t.o tap/basic.o $(LIBINN)
 	$(LINK) lib/getaddrinfo.o lib/getaddrinfo-t.o tap/basic.o \
@@ -126,7 +126,7 @@
 	    $(LIBINN) $(LIBS)
 
 lib/getnameinfo.o: ../lib/getnameinfo.c
-	$(LIBCC) $(CFLAGS) -DTESTING -c -o $@ ../lib/getnameinfo.c
+	$(CC) $(CFLAGS) -DTESTING -c -o $@ ../lib/getnameinfo.c
 
 lib/getnameinfo.t: lib/getnameinfo.o lib/getnameinfo-t.o tap/basic.o $(LIBINN)
 	$(LINK) lib/getnameinfo.o lib/getnameinfo-t.o tap/basic.o \
@@ -145,19 +145,19 @@
 	$(LINK) lib/hex-t.o tap/basic.o $(LIBINN) $(LIBS)
 
 lib/inet_aton.o: ../lib/inet_aton.c
-	$(LIBCC) $(CFLAGS) -DTESTING -c -o $@ ../lib/inet_aton.c
+	$(CC) $(CFLAGS) -DTESTING -c -o $@ ../lib/inet_aton.c
 
 lib/inet_aton.t: lib/inet_aton.o lib/inet_aton-t.o tap/basic.o $(LIBINN)
 	$(LINK) lib/inet_aton.o lib/inet_aton-t.o tap/basic.o $(LIBINN)
 
 lib/inet_ntoa.o: ../lib/inet_ntoa.c
-	$(LIBCC) $(CFLAGS) -DTESTING -c -o $@ ../lib/inet_ntoa.c
+	$(CC) $(CFLAGS) -DTESTING -c -o $@ ../lib/inet_ntoa.c
 
 lib/inet_ntoa.t: lib/inet_ntoa.o lib/inet_ntoa-t.o tap/basic.o $(LIBINN)
 	$(LINK) lib/inet_ntoa.o lib/inet_ntoa-t.o tap/basic.o $(LIBINN)
 
 lib/inet_ntop.o: ../lib/inet_ntop.c
-	$(LIBCC) $(CFLAGS) -DTESTING -c -o $@ ../lib/inet_ntop.c
+	$(CC) $(CFLAGS) -DTESTING -c -o $@ ../lib/inet_ntop.c
 
 lib/inet_ntop.t: lib/inet_ntop.o lib/inet_ntop-t.o tap/basic.o $(LIBINN)
 	$(LINK) lib/inet_ntop.o lib/inet_ntop-t.o tap/basic.o $(LIBINN)
@@ -180,7 +180,7 @@
 	    $(LIBINN)
 
 lib/mkstemp.o: ../lib/mkstemp.c
-	$(LIBCC) $(CFLAGS) -DTESTING -c -o $@ ../lib/mkstemp.c
+	$(CC) $(CFLAGS) -DTESTING -c -o $@ ../lib/mkstemp.c
 
 lib/mkstemp.t: lib/mkstemp.o lib/mkstemp-t.o tap/basic.o $(LIBINN)
 	$(LINK) lib/mkstemp.o lib/mkstemp-t.o tap/basic.o $(LIBINN)
@@ -200,13 +200,13 @@
 	    tap/string.o $(LIBINN) $(LIBS)
 
 lib/pread.o: ../lib/pread.c
-	$(LIBCC) $(CFLAGS) -DTESTING -c -o $@ ../lib/pread.c
+	$(CC) $(CFLAGS) -DTESTING -c -o $@ ../lib/pread.c
 
 lib/pread.t: lib/pread.o lib/pread-t.o tap/basic.o $(LIBINN)
 	$(LINK) lib/pread.o lib/pread-t.o tap/basic.o $(LIBINN)
 
 lib/pwrite.o: ../lib/pwrite.c
-	$(LIBCC) $(CFLAGS) -DTESTING -c -o $@ ../lib/pwrite.c
+	$(CC) $(CFLAGS) -DTESTING -c -o $@ ../lib/pwrite.c
 
 lib/pwrite.t: lib/pwrite.o lib/pwrite-t.o tap/basic.o $(LIBINN)
 	$(LINK) lib/pwrite.o lib/pwrite-t.o tap/basic.o $(LIBINN)
@@ -215,31 +215,31 @@
 	$(LINK) lib/qio-t.o tap/basic.o $(LIBINN)
 
 lib/reallocarray.o: ../lib/reallocarray.c
-	$(LIBCC) $(CFLAGS) -DTESTING -c -o $@ ../lib/reallocarray.c
+	$(CC) $(CFLAGS) -DTESTING -c -o $@ ../lib/reallocarray.c
 
 lib/reallocarray.t: lib/reallocarray.o lib/reallocarray-t.o tap/basic.o $(LIBINN)
 	$(LINK) lib/reallocarray.o lib/reallocarray-t.o tap/basic.o $(LIBINN)
 
 lib/setenv.o: ../lib/setenv.c
-	$(LIBCC) $(CFLAGS) -DTESTING -c -o $@ ../lib/setenv.c
+	$(CC) $(CFLAGS) -DTESTING -c -o $@ ../lib/setenv.c
 
 lib/setenv.t: lib/setenv.o lib/setenv-t.o tap/basic.o $(LIBINN)
 	$(LINK) lib/setenv.o lib/setenv-t.o tap/basic.o $(LIBINN)
 
 lib/snprintf.o: ../lib/snprintf.c
-	$(LIBCC) $(CFLAGS) -DTESTING -c -o $@ ../lib/snprintf.c
+	$(CC) $(CFLAGS) -DTESTING -c -o $@ ../lib/snprintf.c
 
 lib/snprintf.t: lib/snprintf.o lib/snprintf-t.o tap/basic.o $(LIBINN)
 	$(LINK) lib/snprintf.o lib/snprintf-t.o tap/basic.o $(LIBINN)
 
 lib/strlcat.o: ../lib/strlcat.c
-	$(LIBCC) $(CFLAGS) -DTESTING -c -o $@ ../lib/strlcat.c
+	$(CC) $(CFLAGS) -DTESTING -c -o $@ ../lib/strlcat.c
 
 lib/strlcat.t: lib/strlcat.o lib/strlcat-t.o tap/basic.o $(LIBINN)
 	$(LINK) lib/strlcat.o lib/strlcat-t.o tap/basic.o $(LIBINN)
 
 lib/strlcpy.o: ../lib/strlcpy.c
-	$(LIBCC) $(CFLAGS) -DTESTING -c -o $@ ../lib/strlcpy.c
+	$(CC) $(CFLAGS) -DTESTING -c -o $@ ../lib/strlcpy.c
 
 lib/strlcpy.t: lib/strlcpy.o lib/strlcpy-t.o tap/basic.o $(LIBINN)
 	$(LINK) lib/strlcpy.o lib/strlcpy-t.o tap/basic.o $(LIBINN)
@@ -260,7 +260,7 @@
 	$(LINK) lib/xmalloc.o $(LIBINN)
 
 lib/xwrite.o: ../lib/xwrite.c
-	$(LIBCC) $(CFLAGS) -DTESTING -c -o $@ ../lib/xwrite.c
+	$(CC) $(CFLAGS) -DTESTING -c -o $@ ../lib/xwrite.c
 
 lib/xwrite.t: lib/xwrite-t.o lib/xwrite.o lib/fakewrite.o tap/basic.o $(LIBINN)
 	$(LINK) lib/xwrite-t.o lib/xwrite.o lib/fakewrite.o tap/basic.o \
@@ -274,13 +274,13 @@
 	$(LINKDEPS) overview/api-t.o tap/basic.o $(STORAGELIBS) $(LIBS)
 
 overview/buffindexed-t.o: overview/overview-t.c
-	$(LIBCC) $(CFLAGS) -DOVTYPE=buffindexed -c -o $@ overview/overview-t.c
+	$(CC) $(CFLAGS) -DOVTYPE=buffindexed -c -o $@ overview/overview-t.c
 
 overview/buffindexed.t: overview/buffindexed-t.o tap/basic.o $(STORAGEDEPS)
 	$(LINKDEPS) overview/buffindexed-t.o tap/basic.o $(STORAGELIBS) $(LIBS)
 
 overview/tradindexed-t.o: overview/overview-t.c
-	$(LIBCC) $(CFLAGS) -DOVTYPE=tradindexed -c -o $@ overview/overview-t.c
+	$(CC) $(CFLAGS) -DOVTYPE=tradindexed -c -o $@ overview/overview-t.c
 
 overview/tradindexed.t: overview/tradindexed-t.o tap/basic.o $(STORAGEDEPS)
 	$(LINKDEPS) overview/tradindexed-t.o tap/basic.o $(STORAGELIBS) $(LIBS)



More information about the inn-committers mailing list