| [617118d] | 1 | Submitted By: Ryan Oliver <ryan.oliver@pha.com.au | 
|---|
|  | 2 | Date: 2005-01-23 | 
|---|
|  | 3 | Initial Package Version: XFree 4.2.99 | 
|---|
|  | 4 | Upstream Status: Unknown | 
|---|
|  | 5 | Origin: Gentoo | 
|---|
|  | 6 | Description: Ensures objects archived in static libs get built with -fPIC | 
|---|
|  | 7 | A notable barf is when building libaudio (NAS) linking against | 
|---|
|  | 8 | libXau.a | 
|---|
|  | 9 |  | 
|---|
|  | 10 | --- xc/lib/Xau/Imakefile.IncludeSharedObjectInNormalLib 2001-01-17 14:42:24.000000000 -0500 | 
|---|
|  | 11 | +++ xc/lib/Xau/Imakefile        2003-01-29 02:25:49.000000000 -0500 | 
|---|
|  | 12 | @@ -37,6 +37,8 @@ | 
|---|
|  | 13 | OBJS = AuDispose.o AuFileName.o AuGetAddr.o AuGetBest.o AuLock.o \ | 
|---|
|  | 14 | AuRead.o AuUnlock.o AuWrite.o $(K5ENCOBJ) | 
|---|
|  | 15 |  | 
|---|
|  | 16 | +#define IncludeSharedObjectInNormalLib | 
|---|
|  | 17 | + | 
|---|
|  | 18 | #include <Library.tmpl> | 
|---|
|  | 19 |  | 
|---|
|  | 20 | DependTarget() | 
|---|
|  | 21 | --- xc/lib/xkbfile/Imakefile.IncludeSharedObjectInNormalLib     2001-08-27 13:40:59.000000000 -0400 | 
|---|
|  | 22 | +++ xc/lib/xkbfile/Imakefile    2003-01-29 02:25:49.000000000 -0500 | 
|---|
|  | 23 | @@ -34,6 +34,8 @@ | 
|---|
|  | 24 |  | 
|---|
|  | 25 | ROOT_DEFINES = -DDFLT_XKB_CONFIG_ROOT=\"$(LIBDIR)/xkb\" | 
|---|
|  | 26 |  | 
|---|
|  | 27 | +#define IncludeSharedObjectInNormalLib | 
|---|
|  | 28 | + | 
|---|
|  | 29 | #include <Library.tmpl> | 
|---|
|  | 30 |  | 
|---|
|  | 31 | DependTarget() | 
|---|
|  | 32 | --- xc/lib/xkbui/Imakefile.IncludeSharedObjectInNormalLib       1999-03-13 22:21:21.000000000 -0500 | 
|---|
|  | 33 | +++ xc/lib/xkbui/Imakefile      2003-01-29 02:25:49.000000000 -0500 | 
|---|
|  | 34 | @@ -15,6 +15,8 @@ | 
|---|
|  | 35 | HEADERS = XKBui.h | 
|---|
|  | 36 | INCLUDES = -I. -I$(EXTINCSRC) -I../xkbfile | 
|---|
|  | 37 |  | 
|---|
|  | 38 | +#define IncludeSharedObjectInNormalLib | 
|---|
|  | 39 | + | 
|---|
|  | 40 | #include <Library.tmpl> | 
|---|
|  | 41 |  | 
|---|
|  | 42 | DependTarget() | 
|---|
|  | 43 | --- xc/programs/Xserver/hw/xfree86/parser/Imakefile.IncludeSharedObjectInNormalLib      2003-01-29 02:41:13.000000000 -0500 | 
|---|
|  | 44 | +++ xc/programs/Xserver/hw/xfree86/parser/Imakefile     2003-01-29 02:41:53.000000000 -0500 | 
|---|
|  | 45 | @@ -36,9 +36,11 @@ | 
|---|
|  | 46 | -DXCONFIGFILE=\"$(XCONFIGFILE)\" \ | 
|---|
|  | 47 | -DXVERSION="$(XVERS)" | 
|---|
|  | 48 |  | 
|---|
|  | 49 | +#define IncludeSharedObjectInNormalLib | 
|---|
|  | 50 | + | 
|---|
|  | 51 | #include <Library.tmpl> | 
|---|
|  | 52 |  | 
|---|
|  | 53 | -SpecialCObjectRule(scan,NullParameter,$(CONFIG_DEFINES) $(MODULEDEFINES) $(EXT_DEFINES)) | 
|---|
|  | 54 | +SpecialCObjectRule(scan,NullParameter,$(CONFIG_DEFINES) $(MODULEDEFINES) $(EXT_DEFINES) $(PICFLAGS)) | 
|---|
|  | 55 |  | 
|---|
|  | 56 | NormalProgramTarget(cpconfig,cpconfig.o $(OBJS),NullParameter,$(LOCAL_LIBRARIES),NullParameter) | 
|---|
|  | 57 |  | 
|---|