public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sys-libs/timezone-data/files: timezone-data-2008f-makefile-libs-not-flags.patch
@ 2008-10-14  9:50 Robin H. Johnson (robbat2)
  0 siblings, 0 replies; only message in thread
From: Robin H. Johnson (robbat2) @ 2008-10-14  9:50 UTC (permalink / raw
  To: gentoo-commits

robbat2     08/10/14 09:50:56

  Added:                timezone-data-2008f-makefile-libs-not-flags.patch
  Log:
  Fix bug #226929 with linking fun.
  (Portage version: 2.2_rc11/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64)

Revision  Changes    Path
1.1                  sys-libs/timezone-data/files/timezone-data-2008f-makefile-libs-not-flags.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/timezone-data/files/timezone-data-2008f-makefile-libs-not-flags.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/timezone-data/files/timezone-data-2008f-makefile-libs-not-flags.patch?rev=1.1&content-type=text/plain

Index: timezone-data-2008f-makefile-libs-not-flags.patch
===================================================================
Get some real sanity into the linking situation.
- LDLIBS is for libraries only.
- Flags to the linking are passed as LDFLAGS, not LFLAGS.
- LDFLAGS was missed for the 'date' target.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

diff -Nuar Makefile Makefile
--- Makefile	2008-10-14 02:31:04.388508402 -0700
+++ Makefile	2008-10-14 02:36:18.931855910 -0700
@@ -83,7 +83,7 @@
 
 # Non-default libraries needed to link.
 # Add -lintl if you want to use `gettext' on Solaris.
-LDLIBS=$(LDFLAGS)
+LDLIBS=
 
 # Add the following to the end of the "CFLAGS=" line as needed.
 #  -DHAVE_ADJTIME=0 if `adjtime' does not exist (SVR0?)
@@ -309,10 +309,10 @@
 		cp date.1 $(MANDIR)/man1/.
 
 zdump:		$(TZDOBJS)
-		$(CC) $(CFLAGS) $(LFLAGS) $(TZDOBJS) $(LDLIBS) -o $@
+		$(CC) $(CFLAGS) $(LDFLAGS) $(TZDOBJS) $(LDLIBS) -o $@
 
 zic:		$(TZCOBJS) yearistype
-		$(CC) $(CFLAGS) $(LFLAGS) $(TZCOBJS) $(LDLIBS) -o $@
+		$(CC) $(CFLAGS) $(LDFLAGS) $(TZCOBJS) $(LDLIBS) -o $@
 
 yearistype:	yearistype.sh
 		cp yearistype.sh yearistype
@@ -351,7 +351,7 @@
 			then ranlib $@ ; fi
 
 date:		$(DATEOBJS)
-		$(CC) $(CFLAGS) date.o localtime.o asctime.o strftime.o \
+		$(CC) $(CFLAGS) $(LDFLAGS) date.o localtime.o asctime.o strftime.o \
 			$(LDLIBS) -lc -o $@
 
 tzselect:	tzselect.ksh






^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-10-14  9:50 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-10-14  9:50 [gentoo-commits] gentoo-x86 commit in sys-libs/timezone-data/files: timezone-data-2008f-makefile-libs-not-flags.patch Robin H. Johnson (robbat2)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox