[121466] users/dports/ports/tex/texlive-bin

dports at macports.org dports at macports.org
Wed Jun 25 20:06:32 PDT 2014


Revision: 121466
          https://trac.macports.org/changeset/121466
Author:   dports at macports.org
Date:     2014-06-25 20:06:32 -0700 (Wed, 25 Jun 2014)
Log Message:
-----------
[/users/dports] texlive-bin: use muniversal and patches to luajit to
attempt to fix +universal variant; add missing dependency on libXi

Modified Paths:
--------------
    users/dports/ports/tex/texlive-bin/Portfile

Added Paths:
-----------
    users/dports/ports/tex/texlive-bin/files/patch-libs_luajit_configure.diff
    users/dports/ports/tex/texlive-bin/files/patch-texk_web2c_configure.diff

Modified: users/dports/ports/tex/texlive-bin/Portfile
===================================================================
--- users/dports/ports/tex/texlive-bin/Portfile	2014-06-26 02:39:38 UTC (rev 121465)
+++ users/dports/ports/tex/texlive-bin/Portfile	2014-06-26 03:06:32 UTC (rev 121466)
@@ -5,6 +5,10 @@
 PortGroup       compiler_blacklist_versions 1.0
 PortGroup       texlive 1.0
 
+# luajittex requires muniversal (and some patches to configure
+# scripts) to build universal
+PortGroup       muniversal 1.0
+
 name            texlive-bin
 version         2014
 
@@ -79,6 +83,11 @@
                    patch-texk_xdvik_xdvi-sh.in.diff \
                    patch-texk_chktex_Makefile.in.diff
 
+# patches to luajit/luajittex's config scripts to correctly detect
+# architecture in universal builds
+patchfiles-append  patch-libs_luajit_configure.diff \
+                   patch-texk_web2c_configure.diff
+
 post-patch {
     reinplace "s|@@TEXMFDIST@@|${texlive_texmfdist}|" ${worksrcpath}/texk/texlive/linked_scripts/Makefile.in
     reinplace "s|@@TEXMFDIST@@|${texlive_texmfdist}|" ${worksrcpath}/texk/texlive/tl_scripts/Makefile.in
@@ -171,7 +180,6 @@
     }
 }
 
-variant universal {}
 configure.cppflags-delete   -I${prefix}/include
 configure.ldflags-delete    -L${prefix}/lib
 configure.cppflags-append   -isystem${prefix}/include
@@ -236,7 +244,7 @@
 variant x11 description {Build with x11 support, using Xaw widgets for xdvi} {
     depends_lib-append port:xorg-libXp
     configure.args-delete --without-x --without-pdfopen
-    depends_lib-append port:xorg-libXaw
+    depends_lib-append port:xorg-libXaw port:xorg-libXi
     configure.args-append --with-xdvi-x-toolkit=xaw
 }
 

Added: users/dports/ports/tex/texlive-bin/files/patch-libs_luajit_configure.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-libs_luajit_configure.diff	                        (rev 0)
+++ users/dports/ports/tex/texlive-bin/files/patch-libs_luajit_configure.diff	2014-06-26 03:06:32 UTC (rev 121466)
@@ -0,0 +1,11 @@
++++ libs/luajit/configure	2014-06-21 09:06:01.000000000 +0800
+--- libs/luajit/configure.orig	2014-06-25 16:40:10.000000000 +0800
+@@ -5297,7 +5297,7 @@
+ 
+ 
+ lj_save_CPPFLAGS=$CPPFLAGS
+-CPPFLAGS="$CPPFLAGS -I$srcdir/LuaJIT-2.0.3/src $LUAJIT_DEFINES -dM"
++CPPFLAGS="$CPPFLAGS $CFLAGS -I$srcdir/LuaJIT-2.0.3/src $LUAJIT_DEFINES -dM"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <lj_arch.h>

Added: users/dports/ports/tex/texlive-bin/files/patch-texk_web2c_configure.diff
===================================================================
--- users/dports/ports/tex/texlive-bin/files/patch-texk_web2c_configure.diff	                        (rev 0)
+++ users/dports/ports/tex/texlive-bin/files/patch-texk_web2c_configure.diff	2014-06-26 03:06:32 UTC (rev 121466)
@@ -0,0 +1,13 @@
+--- texk/web2c/configure.orig	2014-06-26 10:15:18.000000000 +0800
++++ texk/web2c/configure	2014-06-26 10:16:28.000000000 +0800
+@@ -18663,8 +18663,8 @@
+ 
+ LUAJIT_DEFINES=-DLUAJIT_ENABLE_LUA52COMPAT
+ 
+-case $host_os:$host_cpu in #(
+-  *darwin*:x86_64) :
++case $CFLAGS in #(
++  *"-arch x86_64"*) :
+     LUAJIT_LDEXTRA='-pagezero_size 10000 -image_base 100000000' ;; #(
+   *) :
+      ;;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140625/9ff1d79a/attachment.html>


More information about the macports-changes mailing list