diff options
| author | aflinta | 2002-12-31 17:51:54 (GMT) |
|---|---|---|
| committer | cvs2git | 2012-06-24 12:13:13 (GMT) |
| commit | 159289d81946557ed45185a136472b4244b43e57 (patch) | |
| tree | 3f5136c4ab6d152228dfc40b0bf7dedefa0513cd /XFree86-pic.patch | |
| parent | 4d8c5597dae69c97892032192b202596c58e38cb (diff) | |
| download | X11-159289d81946557ed45185a136472b4244b43e57.zip X11-159289d81946557ed45185a136472b4244b43e57.tar.gz | |
- adapted to version 4.2.99.3
Changed files:
XFree86-XTerm.ad.patch -> 1.5
XFree86-Xwrapper.patch -> 1.7
XFree86-disable_glide.patch -> 1.2
XFree86-pic.patch -> 1.2
XFree86-xdm-fixes.patch -> 1.6
XFree86-xman.patch -> 1.5
Diffstat (limited to 'XFree86-pic.patch')
| -rw-r--r-- | XFree86-pic.patch | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/XFree86-pic.patch b/XFree86-pic.patch index c1f53aa..1e96c1e 100644 --- a/XFree86-pic.patch +++ b/XFree86-pic.patch @@ -1,13 +1,26 @@ ---- XFree86-4.0.1Z/xc/config/cf/Library.tmpl.pic Wed Dec 13 16:19:03 2000 -+++ XFree86-4.0.1Z/xc/config/cf/Library.tmpl Wed Dec 13 16:19:28 2000 -@@ -147,8 +147,8 @@ - # define _NormalCleanDir() LibCleanDir(unshared) - # else - # define _NormalLibMkdir() $(_NULLCMD_) --# define _NormalObjCompile(options) NormalLibObjCompile(options) +diff -urN xc.orig/config/cf/Library.tmpl xc/config/cf/Library.tmpl +--- xc.orig/config/cf/Library.tmpl Mon Dec 30 15:52:30 2002 ++++ xc/config/cf/Library.tmpl Mon Dec 30 19:33:30 2002 +@@ -212,9 +212,9 @@ + # if !DoSharedLib && defined(IncludeNormalLibInSharedObject) + # define _NormalObjCompile(options) NormalRelocLibObjCompile(options) + # else +-# define _NormalObjCompile(options) NormalLibObjCompile(options) ++# define _NormalObjCompile(options) NormalLibObjCompile(options $(PICFLAGS)) + # endif -# define _NormalObjCplusplusCompile(options) NormalLibObjCplusplusCompile(options) -+# define _NormalObjCompile(options) NormalLibObjCompile(options $(PICFLAGS)) +# define _NormalObjCplusplusCompile(options) NormalLibObjCplusplusCompile(options $(PICFLAGS)) # define _NormalCleanDir() $(_NULLCMD_) # endif #endif +@@ -227,8 +227,8 @@ + # define _SharedObjCompile(options) NormalSharedLibObjCompile(options) + # define _SharedObjCplusplusCompile(options) NormalSharedLibObjCplusplusCompile(options) + #else +-# define _SharedObjCompile(options) NormalLibObjCompile(options) +-# define _SharedObjCplusplusCompile(options) NormalLibObjCplusplusCompile(options) ++# define _SharedObjCompile(options) NormalLibObjCompile(options $(PICFLAGS)) ++# define _SharedObjCplusplusCompile(options) NormalLibObjCplusplusCompile(options $(PICFLAGS)) + #endif + #endif + |