diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /sys-cluster/mpe2/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
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
Diffstat (limited to 'sys-cluster/mpe2/files')
-rw-r--r-- | sys-cluster/mpe2/files/slog2sdk-trace_rlog-makefile-fixes.patch | 68 | ||||
-rw-r--r-- | sys-cluster/mpe2/files/slog2sdk-trace_sample-makefile-fixes.patch | 68 |
2 files changed, 136 insertions, 0 deletions
diff --git a/sys-cluster/mpe2/files/slog2sdk-trace_rlog-makefile-fixes.patch b/sys-cluster/mpe2/files/slog2sdk-trace_rlog-makefile-fixes.patch new file mode 100644 index 000000000000..4f2119ec69f0 --- /dev/null +++ b/sys-cluster/mpe2/files/slog2sdk-trace_rlog-makefile-fixes.patch @@ -0,0 +1,68 @@ +From 5bc91497bd4b3d2e4e962ffb2d5b9b471c4183c2 Mon Sep 17 00:00:00 2001 +From: Justin Bronder <jsbronder@gmail.com> +Date: Mon, 13 Sep 2010 14:18:51 -0400 +Subject: [PATCH 1/2] slog2sdk/trace_rlog makefile fixes + +- Respect user-defined LDFLAGS when linking PGM_PRINT and PGM_CHECK. +- Do not install libraries during the compile phase. +--- + src/slog2sdk/trace_rlog/src/Makefile.in | 19 ++++++++----------- + 1 files changed, 8 insertions(+), 11 deletions(-) + +diff --git a/src/slog2sdk/trace_rlog/src/Makefile.in b/src/slog2sdk/trace_rlog/src/Makefile.in +index 9b289b8..2d772e0 100644 +--- a/src/slog2sdk/trace_rlog/src/Makefile.in ++++ b/src/slog2sdk/trace_rlog/src/Makefile.in +@@ -48,7 +48,8 @@ RM = @RM@ + + JNI_INC = @JNI_INC@ + CFLAGS = -I.. $(JNI_INC) -I$(TRACE_INCDIR) @COPTS@ +-LDFLAGS = -module -no-undefined -avoid-version @LDFLAGS@ ++LDFLAGS = @LDFLAGS@ ++LIBLDFLAGS = -module -no-undefined -avoid-version @LDFLAGS@ + + # memory leak checker + MEMLIBS = @DEBUG_LIBS@ +@@ -66,33 +67,29 @@ ALL: $(libbuild_dir)/$(LIB_TRACE) $(binbuild_dir)/$(PGM_PRINT) $(binbuild_dir)/$ + + $(libbuild_dir)/$(LIB_TRACE): $(LOBJ) + if [ "$(EXPORT_SYMBOLS)" = "yes" ] ; then \ +- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \ ++ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \ + -export-symbols $(srcdir)/JavaTraceInput.sym \ + -rpath $(libbuild_dir) ; \ + else \ +- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \ ++ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \ + -rpath $(libbuild_dir) ; \ + fi +- $(LIBTOOL) --mode=install $(INSTALL) $(LIB_TRACE) $(libbuild_dir) +- $(LIBTOOL) --finish $(libbuild_dir) + + INSTALL_LIBSO: $(LOBJ) + if [ "$(EXPORT_SYMBOLS)" = "yes" ] ; then \ +- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \ ++ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \ + -export-symbols $(srcdir)/JavaTraceInput.sym \ + -rpath $(LIBDIR) ; \ + else \ +- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \ ++ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \ + -rpath $(LIBDIR) ; \ + fi +- $(LIBTOOL) --mode=install $(INSTALL) $(LIB_TRACE) $(DESTDIR)$(LIBDIR) +- $(LIBTOOL) --finish $(LIBDIR) + + $(binbuild_dir)/$(PGM_PRINT): $(OBJ4T) +- $(CC) @COPTS@ -o $@ $(OBJ4T) $(MEMLIBS) ++ $(CC) @COPTS@ $(LDFLAGS) -o $@ $(OBJ4T) $(MEMLIBS) + + $(binbuild_dir)/$(PGM_CHECK): $(OBJ4E) +- $(CC) @COPTS@ -o $@ $(OBJ4E) $(MEMLIBS) ++ $(CC) @COPTS@ $(LDFLAGS) -o $@ $(OBJ4E) $(MEMLIBS) + + clean: + @-$(RM) *.@OBJEXT@ *.lo *.la +-- +1.7.1 + diff --git a/sys-cluster/mpe2/files/slog2sdk-trace_sample-makefile-fixes.patch b/sys-cluster/mpe2/files/slog2sdk-trace_sample-makefile-fixes.patch new file mode 100644 index 000000000000..717911ffb710 --- /dev/null +++ b/sys-cluster/mpe2/files/slog2sdk-trace_sample-makefile-fixes.patch @@ -0,0 +1,68 @@ +From b23d8d40cf62d03cad7ce777565069368e040a96 Mon Sep 17 00:00:00 2001 +From: Justin Bronder <jsbronder@gmail.com> +Date: Mon, 13 Sep 2010 14:22:10 -0400 +Subject: [PATCH 2/2] slog2sdk/trace_sample makefile fixes + +- Respect user-defined LDFLAGS when linking PGM_PRINT and PGM_CHECK. +- Do not install libraries during the compile phase. +--- + src/slog2sdk/trace_sample/src/Makefile.in | 19 ++++++++----------- + 1 files changed, 8 insertions(+), 11 deletions(-) + +diff --git a/src/slog2sdk/trace_sample/src/Makefile.in b/src/slog2sdk/trace_sample/src/Makefile.in +index f716fff..8d3641a 100644 +--- a/src/slog2sdk/trace_sample/src/Makefile.in ++++ b/src/slog2sdk/trace_sample/src/Makefile.in +@@ -48,7 +48,8 @@ RM = @RM@ + + JNI_INC = @JNI_INC@ + CFLAGS = -I.. $(JNI_INC) -I$(TRACE_INCDIR) @COPTS@ +-LDFLAGS = -module -no-undefined -avoid-version @LDFLAGS@ ++LDFLAGS = @LDFLAGS@ ++LIBLDFLAGS = -module -no-undefined -avoid-version @LDFLAGS@ + + # memory leak checker + MEMLIBS = @DEBUG_LIBS@ +@@ -66,33 +67,29 @@ ALL: $(libbuild_dir)/$(LIB_TRACE) $(binbuild_dir)/$(PGM_PRINT) $(binbuild_dir)/$ + + $(libbuild_dir)/$(LIB_TRACE): $(LOBJ) + if [ "$(EXPORT_SYMBOLS)" = "yes" ] ; then \ +- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \ ++ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \ + -export-symbols $(srcdir)/JavaTraceInput.sym \ + -rpath $(libbuild_dir) ; \ + else \ +- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \ ++ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \ + -rpath $(libbuild_dir) ; \ + fi +- $(LIBTOOL) --mode=install $(INSTALL) $(LIB_TRACE) $(libbuild_dir) +- $(LIBTOOL) --finish $(libbuild_dir) + + INSTALL_LIBSO: $(LOBJ) + if [ "$(EXPORT_SYMBOLS)" = "yes" ] ; then \ +- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \ ++ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \ + -export-symbols $(srcdir)/JavaTraceInput.sym \ + -rpath $(LIBDIR) ; \ + else \ +- $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LDFLAGS) \ ++ $(LIBTOOL) --mode=link $(CC) -o $(LIB_TRACE) $(LOBJ) $(LIBLDFLAGS) \ + -rpath $(LIBDIR) ; \ + fi +- $(LIBTOOL) --mode=install $(INSTALL) $(LIB_TRACE) $(DESTDIR)$(LIBDIR) +- $(LIBTOOL) --finish $(LIBDIR) + + $(binbuild_dir)/$(PGM_PRINT): $(OBJ4T) +- $(CC) @COPTS@ -o $@ $(OBJ4T) $(MEMLIBS) ++ $(CC) @COPTS@ $(LDFLAGS) -o $@ $(OBJ4T) $(MEMLIBS) + + $(binbuild_dir)/$(PGM_CHECK): $(OBJ4E) +- $(CC) @COPTS@ -o $@ $(OBJ4E) $(MEMLIBS) ++ $(CC) @COPTS@ $(LDFLAGS) -o $@ $(OBJ4E) $(MEMLIBS) + + clean: + @-$(RM) *.@OBJEXT@ *.lo *.la +-- +1.7.1 + |