From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1OuRU7-000377-4x for garchives@archives.gentoo.org; Sat, 11 Sep 2010 14:55:19 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 367E1E0866; Sat, 11 Sep 2010 14:55:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 19F8AE086E for ; Sat, 11 Sep 2010 14:55:18 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 17E6A1B4089 for ; Sat, 11 Sep 2010 14:55:17 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2271) id A8A3920054; Sat, 11 Sep 2010 14:55:15 +0000 (UTC) From: "Kacper Kowalik (xarthisius)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, xarthisius@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in x11-misc/fireflies/files: fireflies-2.07-build_system.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: fireflies-2.07-build_system.patch X-VCS-Directories: x11-misc/fireflies/files X-VCS-Committer: xarthisius X-VCS-Committer-Name: Kacper Kowalik Content-Type: text/plain; charset=utf8 Message-Id: <20100911145515.A8A3920054@flycatcher.gentoo.org> Date: Sat, 11 Sep 2010 14:55:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 71327b75-c8c0-4bee-b287-ed6946e5e391 X-Archives-Hash: 81466819362ed147a3d2ede039a9fe05 xarthisius 10/09/11 14:55:15 Added: fireflies-2.07-build_system.patch Log: Respect CXXFLAGS, LDFLAGS wrt bug 336814. Thanks to Diego for the repor= t. Fix parallel build, configure recursively. =20 (Portage version: 2.1.9/cvs/Linux x86_64) Revision Changes Path 1.1 x11-misc/fireflies/files/fireflies-2.07-build_system= .patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/fireflies= /files/fireflies-2.07-build_system.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/fireflies= /files/fireflies-2.07-build_system.patch?rev=3D1.1&content-type=3Dtext/pl= ain Index: fireflies-2.07-build_system.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Multiple QA issues: * Respect CXXFLAGS,LDFLAGS * fix parallel build * configure recursively * don't strip binaries * don't unpack libgfx during make http://bugs.gentoo.org/show_bug.cgi?id=3D336814 --- configure.ac +++ configure.ac @@ -2,6 +2,7 @@ AC_INIT(fireflies, 2.07, guy@somewhere.fscked.org) AC_CONFIG_SRCDIR([src/arrow.cc]) AC_CONFIG_HEADER([config.h]) +AC_CONFIG_SUBDIRS([libgfx]) =20 sys=3D`uname` =20 --- Makefile +++ Makefile @@ -21,18 +21,17 @@ win32/ =20 all: libgfx/src/libgfx.a - cd src && make + $(MAKE) -C src =20 libgfx/src/libgfx.a: - gunzip -c libgfx-1.0.1.tar.gz | tar x - cd libgfx && ./configure && cd src && make + $(MAKE) -C libgfx/src =20 install: all sh ./installit $(DESTDIR) =20 clean: - make -C src clean - make -C win32 clean + $(MAKE) -C src clean + $(MAKE) -C win32 clean =20 dist: rm -rf fireflies-$(VERSION) @@ -42,7 +41,7 @@ =20 # need Make.include temporarily to run make cp Make.include fireflies-$(VERSION) - make -C fireflies-$(VERSION) clean + $(MAKE) -C fireflies-$(VERSION) clean rm -f fireflies-$(VERSION)/Make.include =20 # don't want to include debian's buildroot --- src/Makefile +++ src/Makefile @@ -8,8 +8,7 @@ all: $(PROGRAM) =20 $(PROGRAM): $(OBJECTS) - $(CXX) -o $(PROGRAM) $(OBJECTS) $(LIBS) - strip $(PROGRAM) + $(CXX) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(LIBS) =20 $(OBJECTS): $(HEADERS) =20 @@ -17,7 +16,7 @@ .SUFFIXES: .cc .rc .o =20 .cc.o: - $(CXX) -c $(CFLAGS) -o $@ $< + $(CXX) -c $(CXXFLAGS) -o $@ $< =20 #$(HEADERS_GCH): %.h.gch: %.h # $(CXX) -c -x c++-header $(CFLAGS) -o $@ $< --- Make.include.in +++ Make.include.in @@ -5,7 +5,7 @@ GL_LIBS =3D @GL_LIBS@ OPT_LIBS =3D @OPT_LIBS@ =20 -CFLAGS =3D -Wall -I../libgfx/include/ $(SDL_CFLAGS) @CFLAGS@ +CXXFLAGS =3D -Wall -I../libgfx/include/ $(SDL_CFLAGS) @CXXFLAGS@ LIBS =3D ../libgfx/src/libgfx.a $(GL_LIBS) $(SDL_LIBS) $(OPT_LIBS) @LIBS= @ =20 OBJECTS =3D arrow.o bait.o firefly.o scene.o tail.o utils.o modes.o @OPT= _OBJS@