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 /media-libs/icclib/files/icclib-2.14-make.patch | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.xz |
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 'media-libs/icclib/files/icclib-2.14-make.patch')
-rw-r--r-- | media-libs/icclib/files/icclib-2.14-make.patch | 114 |
1 files changed, 114 insertions, 0 deletions
diff --git a/media-libs/icclib/files/icclib-2.14-make.patch b/media-libs/icclib/files/icclib-2.14-make.patch new file mode 100644 index 00000000000..14e69f17f21 --- /dev/null +++ b/media-libs/icclib/files/icclib-2.14-make.patch @@ -0,0 +1,114 @@ +--- icclib_V2.14/Makefile ++++ icclib_V2.14/Makefile +@@ -3,13 +3,13 @@ + # by uncommenting the appropriate line: + + # Microsoft C++, WinNT setup +-include Makefile.WNT ++#include Makefile.WNT + + # IBM C++, WinNT setup + #include Makefile.IBMNT + + # Generic UNIX setup +-#include Makefile.UNIX ++include Makefile.UNIX + + # Apple OSX + #include Makefile.OSX +@@ -32,7 +32,7 @@ + + + icc$(SUFOBJ): icc.c icc.h +- $(CC) $(CCOF)icc$(SUFOBJ) icc.c ++ $(CC) $(CFLAGS) $(CCOF)icc$(SUFOBJ) icc.c + + libicc$(SUFLIB): icc$(SUFOBJ) + $(LIBU) $(LIBOF)libicc$(SUFLIB) icc$(SUFOBJ) +@@ -41,39 +41,39 @@ + + # Separate for executables + iccstd$(SUFOBJ): iccstd.c icc.h +- $(CC) $(CCOF)iccstd$(SUFOBJ) iccstd.c ++ $(CC) $(CFLAGS) $(CCOF)iccstd$(SUFOBJ) iccstd.c + + + icctest$(SUFOBJ): icctest.c icc.h +- $(CC) $(CCOF)icctest$(SUFOBJ) icctest.c ++ $(CC) $(CFLAGS) $(CCOF)icctest$(SUFOBJ) icctest.c + + icctest$(SUFEXE): icctest$(SUFOBJ) iccstd$(SUFOBJ) libicc$(SUFLIB) + $(LINK) $(LINKOF)icctest$(SUFEXE) icctest$(SUFOBJ) iccstd$(SUFOBJ) libicc$(SUFLIB) + + + lutest$(SUFOBJ): lutest.c icc.h +- $(CC) $(CCOF)lutest$(SUFOBJ) lutest.c ++ $(CC) $(CFLAGS) $(CCOF)lutest$(SUFOBJ) lutest.c + + lutest$(SUFEXE): lutest$(SUFOBJ) iccstd$(SUFOBJ) libicc$(SUFLIB) + $(LINK) $(LINKOF)lutest$(SUFEXE) lutest$(SUFOBJ) iccstd$(SUFOBJ) libicc$(SUFLIB) + + + icclu$(SUFOBJ): icclu.c icc.h +- $(CC) $(CCOF)icclu$(SUFOBJ) icclu.c ++ $(CC) $(CFLAGS) $(CCOF)icclu$(SUFOBJ) icclu.c + + icclu$(SUFEXE): icclu$(SUFOBJ) iccstd$(SUFOBJ) libicc$(SUFLIB) + $(LINK) $(LINKOF)icclu$(SUFEXE) icclu$(SUFOBJ) iccstd$(SUFOBJ) libicc$(SUFLIB) + + + iccdump$(SUFOBJ): iccdump.c icc.h +- $(CC) $(CCOF)iccdump$(SUFOBJ) iccdump.c ++ $(CC) $(CFLAGS) $(CCOF)iccdump$(SUFOBJ) iccdump.c + + iccdump$(SUFEXE): iccdump$(SUFOBJ) iccstd$(SUFOBJ) libicc$(SUFLIB) + $(LINK) $(LINKOF)iccdump$(SUFEXE) iccdump$(SUFOBJ) iccstd$(SUFOBJ) libicc$(SUFLIB) + + + iccrw$(SUFOBJ): iccrw.c icc.h +- $(CC) $(CCOF)iccrw$(SUFOBJ) iccrw.c ++ $(CC) $(CFLAGS) $(CCOF)iccrw$(SUFOBJ) iccrw.c + + iccrw$(SUFEXE): iccrw$(SUFOBJ) iccstd$(SUFOBJ) libicc$(SUFLIB) + $(LINK) $(LINKOF)iccrw$(SUFEXE) iccrw$(SUFOBJ) iccstd$(SUFOBJ) libicc$(SUFLIB) +--- icclib_V2.14/Makefile.UNIX ++++ icclib_V2.14/Makefile.UNIX +@@ -1,7 +1,7 @@ + # Generic UNIX setup + + SLASH = / +-SUFLIB = .a ++SUFLIB = .so + SUFOBJ = .o + SUFEXE = + CMDSEP = ; +@@ -18,21 +18,22 @@ + STDHDRSDEF = /usr/include + + MAKEU = make +-LIBU = ar -r +-LIBOF = -o ++LIBOF = + RANLIB = echo + AS = as +-CCFLAGSDEF = -DUNIX -c +-CC = cc $(CCFLAGS) $(INCFLAG)$(STDHDRS) ++CCFLAGSDEF = -DUNIX -fPIC -c ++CFLAGS += $(CCFLAGSDEF) $(INCFLAG)$(STDHDRS) ++CC = cc + CCOF = -o +-LINKFLAGSDEF = -lm ++LINKFLAGSDEF = -shared + LINKLIBS = +-LINK = cc $(LINKFLAGS) $(LINKLIBS) ++LINK = $(CC) $(LINKFLAGSDEF) $(LDFLAGS) $(LINKLIBS) + LINKOF = -o ++LIBU = $(CC) $(LINKFLAGSDEF) $(LDFLAGS) -Wl,-soname,libicc.so.$(ICCLIB_SOVERSION) $(LINKLIBS) -o + + .SUFFIXES: + .SUFFIXES: .c $(SUFLIB) $(SUFOBJ) $(SUFEXE) + + .c$(SUFOBJ): +- $(CC) $(CCOF)$*$(SUFOBJ) $< ++ $(CC) $(CFLAGS) $(CCOF)$*$(SUFOBJ) $< + |