[141582] trunk/dports/x11/xorg-libXfont
jeremyhu at macports.org
jeremyhu at macports.org
Sat Dec 12 02:08:29 PST 2015
Revision: 141582
https://trac.macports.org/changeset/141582
Author: jeremyhu at macports.org
Date: 2015-10-21 21:44:45 -0700 (Wed, 21 Oct 2015)
Log Message:
-----------
xorg-libXfont: Don't build with -flat_namespace
Modified Paths:
--------------
trunk/dports/x11/xorg-libXfont/Portfile
Added Paths:
-----------
trunk/dports/x11/xorg-libXfont/files/
trunk/dports/x11/xorg-libXfont/files/0001-stubs-Add-missing-externs-for-declarations-in-the-NO.patch
trunk/dports/x11/xorg-libXfont/files/0002-Use-NO_WEAK_SYMBOLS-instead-of-flat_namespace.patch
Modified: trunk/dports/x11/xorg-libXfont/Portfile
===================================================================
--- trunk/dports/x11/xorg-libXfont/Portfile 2015-10-21 23:10:16 UTC (rev 141581)
+++ trunk/dports/x11/xorg-libXfont/Portfile 2015-10-22 04:44:45 UTC (rev 141582)
@@ -4,6 +4,7 @@
name xorg-libXfont
version 1.5.1
+revision 1
categories x11 devel
license X11 BSD
maintainers jeremyhu openmaintainer
@@ -23,6 +24,7 @@
depends_build \
port:pkgconfig \
+ port:xorg-util-macros \
port:xorg-xtrans
depends_lib \
@@ -33,9 +35,15 @@
port:xorg-xproto \
port:xorg-fontsproto
-# Newer libtool add -Wl,-single_module if this isn't set... breaking us
-configure.env LT_MULTI_MODULE=1
+patchfiles \
+ 0001-stubs-Add-missing-externs-for-declarations-in-the-NO.patch \
+ 0002-Use-NO_WEAK_SYMBOLS-instead-of-flat_namespace.patch
+patch.pre_args -p1
+
+use_autoreconf yes
+autoreconf.args -fvi
+
configure.args \
--with-bzip2 \
--without-xmlto \
Added: trunk/dports/x11/xorg-libXfont/files/0001-stubs-Add-missing-externs-for-declarations-in-the-NO.patch
===================================================================
--- trunk/dports/x11/xorg-libXfont/files/0001-stubs-Add-missing-externs-for-declarations-in-the-NO.patch (rev 0)
+++ trunk/dports/x11/xorg-libXfont/files/0001-stubs-Add-missing-externs-for-declarations-in-the-NO.patch 2015-10-22 04:44:45 UTC (rev 141582)
@@ -0,0 +1,71 @@
+From 2788c6984bc54bfba61b2dbdb5353978199d8a37 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Wed, 21 Oct 2015 21:27:26 -0700
+Subject: [PATCH 1/2] stubs: Add missing externs for declarations in the
+ NO_WEAK_SYMBOLS && PIC stubs resolution
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+---
+ src/stubs/stubs.h | 46 +++++++++++++++++++++++-----------------------
+ 1 file changed, 23 insertions(+), 23 deletions(-)
+
+diff --git a/src/stubs/stubs.h b/src/stubs/stubs.h
+index 7d499d5..c09c675 100644
+--- a/src/stubs/stubs.h
++++ b/src/stubs/stubs.h
+@@ -38,29 +38,29 @@ extern int _font_init_stubs(void);
+ (*__##sym)(f, _args); \
+ va_end(_args)
+
+-int (*__client_auth_generation)(ClientPtr);
+-Bool (*__ClientSignal)(ClientPtr);
+-void (*__DeleteFontClientID)(Font);
+-void (*__VErrorF)(const char *, va_list);
+-FontPtr (*__find_old_font)(FSID);
+-FontResolutionPtr (*__GetClientResolutions)(int *);
+-int (*__GetDefaultPointSize)(void);
+-Font (*__GetNewFontClientID)(void);
+-unsigned long (*__GetTimeInMillis)(void);
+-int (*__init_fs_handlers)(FontPathElementPtr, BlockHandlerProcPtr);
+-int (*__RegisterFPEFunctions)(NameCheckFunc, InitFpeFunc, FreeFpeFunc,
+- ResetFpeFunc, OpenFontFunc, CloseFontFunc, ListFontsFunc,
+- StartLfwiFunc, NextLfwiFunc, WakeupFpeFunc, ClientDiedFunc,
+- LoadGlyphsFunc, StartLaFunc, NextLaFunc, SetPathFunc);
+-void (*__remove_fs_handlers)(FontPathElementPtr, BlockHandlerProcPtr, Bool);
+-void **__ptr_serverClient;
+-int (*__set_font_authorizations)(char **, int *, ClientPtr);
+-int (*__StoreFontClientFont)(FontPtr, Font);
+-Atom (*__MakeAtom)(const char *, unsigned, int);
+-int (*__ValidAtom)(Atom);
+-char *(*__NameForAtom)(Atom);
+-unsigned long *__ptr_serverGeneration;
+-void (*__register_fpe_functions)(void);
++extern int (*__client_auth_generation)(ClientPtr);
++extern Bool (*__ClientSignal)(ClientPtr);
++extern void (*__DeleteFontClientID)(Font);
++extern void (*__VErrorF)(const char *, va_list);
++extern FontPtr (*__find_old_font)(FSID);
++extern FontResolutionPtr (*__GetClientResolutions)(int *);
++extern int (*__GetDefaultPointSize)(void);
++extern Font (*__GetNewFontClientID)(void);
++extern unsigned long (*__GetTimeInMillis)(void);
++extern int (*__init_fs_handlers)(FontPathElementPtr, BlockHandlerProcPtr);
++extern int (*__RegisterFPEFunctions)(NameCheckFunc, InitFpeFunc, FreeFpeFunc,
++ ResetFpeFunc, OpenFontFunc, CloseFontFunc, ListFontsFunc,
++ StartLfwiFunc, NextLfwiFunc, WakeupFpeFunc, ClientDiedFunc,
++ LoadGlyphsFunc, StartLaFunc, NextLaFunc, SetPathFunc);
++extern void (*__remove_fs_handlers)(FontPathElementPtr, BlockHandlerProcPtr, Bool);
++extern void **__ptr_serverClient;
++extern int (*__set_font_authorizations)(char **, int *, ClientPtr);
++extern int (*__StoreFontClientFont)(FontPtr, Font);
++extern Atom (*__MakeAtom)(const char *, unsigned, int);
++extern int (*__ValidAtom)(Atom);
++extern char *(*__NameForAtom)(Atom);
++extern unsigned long *__ptr_serverGeneration;
++extern void (*__register_fpe_functions)(void);
+ #else /* NO_WEAK_SYMBOLS && PIC */
+ #define OVERRIDE_DATA(sym)
+ #define OVERRIDE_SYMBOL(sym,...)
+--
+2.6.2
+
Added: trunk/dports/x11/xorg-libXfont/files/0002-Use-NO_WEAK_SYMBOLS-instead-of-flat_namespace.patch
===================================================================
--- trunk/dports/x11/xorg-libXfont/files/0002-Use-NO_WEAK_SYMBOLS-instead-of-flat_namespace.patch (rev 0)
+++ trunk/dports/x11/xorg-libXfont/files/0002-Use-NO_WEAK_SYMBOLS-instead-of-flat_namespace.patch 2015-10-22 04:44:45 UTC (rev 141582)
@@ -0,0 +1,59 @@
+From d6877a7c1c35985f6a75b6cd4e814595e781adc4 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Wed, 21 Oct 2015 21:03:00 -0700
+Subject: [PATCH 2/2] Use NO_WEAK_SYMBOLS instead of -flat_namespace
+
+Lesser of two evil hacks, I suppose...
+
+This reverts commit 0386fa77367a305deea3cc27f8a3865cc3c467c0.
+---
+ configure.ac | 3 ---
+ src/stubs/stubs.h | 11 +----------
+ 2 files changed, 1 insertion(+), 13 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7cb6bdf..640cc92 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -213,9 +213,6 @@ case $host_os in
+ linux*)
+ OS_CFLAGS="-D_XOPEN_SOURCE"
+ ;;
+- darwin*)
+- OS_CFLAGS="-Wl,-flat_namespace"
+- ;;
+ *)
+ OS_CFLAGS=
+ ;;
+diff --git a/src/stubs/stubs.h b/src/stubs/stubs.h
+index c09c675..9e71806 100644
+--- a/src/stubs/stubs.h
++++ b/src/stubs/stubs.h
+@@ -10,7 +10,7 @@
+ #endif
+
+ /* this probably works for Mach-O too, but probably not for PE */
+-#if (defined(__APPLE__) || defined(__ELF__)) && defined(__GNUC__) && (__GNUC__ >= 3)
++#if defined(__ELF__) && defined(__GNUC__) && (__GNUC__ >= 3)
+ #define weak __attribute__((weak))
+ #else
+ #define weak
+@@ -67,15 +67,6 @@ extern void (*__register_fpe_functions)(void);
+ #define OVERRIDE_VA_SYMBOL(sym,f)
+ #endif
+
+-/* This is really just a hack for now... __APPLE__ really should be using
+- * the weak symbols route above, but it's causing an as-yet unresolved issue,
+- * so we're instead building with flat_namespace.
+- */
+-#ifdef __APPLE__
+-#undef weak
+-#define weak
+-#endif
+-
+ extern FontPtr find_old_font ( FSID id );
+ extern int set_font_authorizations ( char **authorizations,
+ int *authlen,
+--
+2.6.2
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/50e49e31/attachment.html>
More information about the macports-changes
mailing list