mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-02-05 12:17:28 -08:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
71 lines
2.5 KiB
Diff
71 lines
2.5 KiB
Diff
diff -Nur libmatthew-java-0.7.2/Makefile libmatthew-java-0.7.2_patched/Makefile
|
|
--- 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,12 @@
|
|
CC?=gcc
|
|
LD?=gcc
|
|
JPPFLAGS+=-C -P
|
|
-CFLAGS+=-Wall -Os -pedantic -Werror
|
|
+CFLAGS+=-Wall -pedantic
|
|
CSTD?=-std=c99
|
|
CSHAREFLAG+=-fpic -fno-stack-protector
|
|
GCJJNIFLAG=-fjni
|
|
JVERCFLAGS+=-source 1.5
|
|
JCFLAGS+=
|
|
-INCLUDES+=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
|
|
JAVADOCFLAGS?=-quiet -author -link http://java.sun.com/j2se/1.4.2/docs/api/
|
|
|
|
LDVER?=$(shell ld -v | cut -d' ' -f1)
|
|
@@ -20,9 +20,8 @@
|
|
|
|
ifeq ($(LDVER),GNU)
|
|
LDSHAREFLAGS+=-fpic -shared
|
|
-else
|
|
-LDSHAREFLAGS+=-lc
|
|
endif
|
|
+LDLIBS=-lc
|
|
|
|
PREFIX?=/usr/local
|
|
JARDIR?=$(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)
|
|
|
|
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.matthew.unix.USOutputStream
|
|
cgi-java.h: .classes
|
|
@@ -91,13 +85,11 @@
|
|
tar zcf $@ libmatthew-java-$(MATTVER)
|
|
|
|
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)
|
|
+ $(MAKE) .enabledebug
|
|
+ (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)
|
|
+ $(MAKE) .disabledebug
|
|
+ (cd classes;jar cf ../$@ cx/ath/matthew/debug/*.class)
|
|
.enabledebug: cx/ath/matthew/debug/Debug.jpp
|
|
mkdir -p classes
|
|
cpp $(PPFLAGS) $(JPPFLAGS) -DDEBUGSETTING=true < cx/ath/matthew/debug/Debug.jpp > cx/ath/matthew/debug/Debug.java
|