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 1NlgAH-00057G-VE for garchives@archives.gentoo.org; Sun, 28 Feb 2010 10:14:22 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 45F63E07EE; Sun, 28 Feb 2010 10:14:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 08F15E07EE for ; Sun, 28 Feb 2010 10:14:20 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id A08A01B4147 for ; Sun, 28 Feb 2010 10:14:19 +0000 (UTC) Received: from serkan by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1NlgAF-0003aa-3k for gentoo-commits@lists.gentoo.org; Sun, 28 Feb 2010 10:14:19 +0000 From: "Serkan Kaba (serkan)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, serkan@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-java/libmatthew-java/files: libmatthew-java-0.7.2-makefile-fixes.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: libmatthew-java-0.7.2-makefile-fixes.patch X-VCS-Directories: dev-java/libmatthew-java/files X-VCS-Committer: serkan X-VCS-Committer-Name: Serkan Kaba Content-Type: text/plain; charset=utf8 Message-Id: Sender: Serkan Kaba Date: Sun, 28 Feb 2010 10:14:19 +0000 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: d0dccd0f-9807-4573-ad93-b1cb7b67565d X-Archives-Hash: 1409464ec7b7a54a575456382febe1c8 serkan 10/02/28 10:14:19 Added: libmatthew-java-0.7.2-makefile-fixes.patch Log: Version bump. (Portage version: 2.2_rc33/cvs/Linux x86_64) Revision Changes Path 1.1 dev-java/libmatthew-java/files/libmatthew-java-0.7.2= -makefile-fixes.patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/libmatthe= w-java/files/libmatthew-java-0.7.2-makefile-fixes.patch?rev=3D1.1&view=3D= markup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/libmatthe= w-java/files/libmatthew-java-0.7.2-makefile-fixes.patch?rev=3D1.1&content= -type=3Dtext/plain Index: libmatthew-java-0.7.2-makefile-fixes.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 diff -Nur libmatthew-java-0.7.2/Makefile libmatthew-java-0.7.2_patched/Ma= kefile --- libmatthew-java-0.7.2/Makefile 2009-04-05 12:46:42.000000000 +0300 +++ libmatthew-java-0.7.2_patched/Makefile 2010-02-28 12:07:15.000000000 = +0200 @@ -6,13 +6,13 @@ CC?=3Dgcc LD?=3Dgcc JPPFLAGS+=3D-C -P -CFLAGS+=3D-Wall -Os -pedantic -Werror +CFLAGS+=3D-Wall -pedantic -Werror CSTD?=3D-std=3Dc99 CSHAREFLAG+=3D-fpic -fno-stack-protector GCJJNIFLAG=3D-fjni JVERCFLAGS+=3D-source 1.5 JCFLAGS+=3D -INCLUDES+=3D-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux +INCLUDES=3D-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux JAVADOCFLAGS?=3D-quiet -author -link http://java.sun.com/j2se/1.4.2/docs= /api/ =20 LDVER?=3D$(shell ld -v | cut -d' ' -f1) @@ -20,9 +20,8 @@ =20 ifeq ($(LDVER),GNU) LDSHAREFLAGS+=3D-fpic -shared -else -LDSHAREFLAGS+=3D-lc endif +LDLIBS=3D-lc =20 PREFIX?=3D/usr/local JARDIR?=3D$(PREFIX)/share/java @@ -62,12 +61,7 @@ io-$(IOVER).jar: .classes (cd classes; $(JAR) cf ../$@ cx/ath/matthew/io/*class) unix-$(UNIXVER).jar: .classes -ifeq ($(DEBUG),enable) - echo "Class-Path: $(JARDIR)/debug-$(DEBUG).jar" > Manifest -else - echo "Class-Path: " > Manifest -endif - (cd classes; $(JAR) cfm ../$@ ../Manifest cx/ath/matthew/unix/*class) + (cd classes; $(JAR) cf ../$@ cx/ath/matthew/unix/*class) =20 hexdump-$(HEXVER).jar: .classes (cd classes; $(JAR) cf ../$@ cx/ath/matthew/utils/Hexdump.class) @@ -75,7 +69,7 @@ %.o: %.c %.h $(CC) $(CFLAGS) $(CSTD) $(CSHAREFLAG) $(INCLUDES) -c -o $@ $< lib%.so: %.o - $(CC) $(LDFLAGS) $(LDSHAREFLAGS) -o $@ $< + $(CC) $(LDFLAGS) $(LDSHAREFLAGS) -o $@ $< $(LDLIBS) unix-java.h: .classes $(JAVAH) -classpath classes -o $@ cx.ath.matthew.unix.UnixServerSocket = cx.ath.matthew.unix.UnixSocket cx.ath.matthew.unix.USInputStream cx.ath.m= atthew.unix.USOutputStream cgi-java.h: .classes @@ -91,12 +85,10 @@ =20 debug-enable-$(DEBUGVER).jar: cx/ath/matthew/debug/Debug.jpp make .enabledebug - echo "Class-Path: $(JARDIR)/hexdump.jar" > Manifest - (cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class) + (cd classes;jar cf ../$@ cx/ath/matthew/debug/*.class) debug-disable-$(DEBUGVER).jar: cx/ath/matthew/debug/Debug.jpp make .disabledebug - echo "Class-Path: $(JARDIR)/hexdump.jar" > Manifest - (cd classes;jar cfm ../$@ ../Manifest cx/ath/matthew/debug/*.class) + (cd classes;jar cf ../$@ cx/ath/matthew/debug/*.class) .enabledebug: cx/ath/matthew/debug/Debug.jpp=20 mkdir -p classes cpp $(PPFLAGS) $(JPPFLAGS) -DDEBUGSETTING=3Dtrue < cx/ath/matthew/debug= /Debug.jpp > cx/ath/matthew/debug/Debug.java