Hanspeter,
I switched approaches for fink-buildenv-modules-0.1.2-2 so that
the X11_DIR, X11_INCLUDE_DIR and X11_LIBRARY_DIR variables are
provided in a new modules/fink-buildenv-x11.sh.in file so your
modules/fink-buildenv-xorg.sh.in can be retained for a future set of
fink xorg packages. We may want to disable the installation of the
fnk-buildenv-xorg.sh for now so as to not confuse package maintainers
and end-users with two X related modules of which only one is
currently usable.
Jack
On Wed, Mar 25, 2015 at 4:08 PM, Jack Howarth <howarth.at.f...@gmail.com> wrote:
> Hanspeter,
> I have posted packaging for fink-buildenv-modules-0.1.2-2 to add
> the following patch...
>
> diff -uNr fink-buildenv-modules-0.1.2.orig/modules/fink-buildenv-xorg.sh.in
> fink-buildenv-modules-0.1.2/modules/fink-buildenv-xorg.sh.in
> --- fink-buildenv-modules-0.1.2.orig/modules/fink-buildenv-xorg.sh.in
> 2015-01-12 07:21:09.000000000 -0500
> +++ fink-buildenv-modules-0.1.2/modules/fink-buildenv-xorg.sh.in
> 2015-03-25 14:16:32.000000000 -0400
> @@ -44,6 +44,14 @@
> export ACLOCAL_PATH=$XORG_ACLOCAL_PATH:$ACLOCAL_PATH
> export PKG_CONFIG_PATH=$XORG_PKG_CONFIG_PATH:$PKG_CONFIG_PATH
>
> +if [ $DARWIN_MAJOR_VERSION -ge 12 ] ; then
> + export X11_INCLUDE_DIR=/opt/X11/include
> + export X11_LIBRARY_DIR=/opt/X11/lib
> +else
> + export X11_INCLUDE_DIR=/usr/X11/include
> + export X11_LIBRARY_DIR=/usr/X11/lib
> +fi
> +
> echo "--------------------"
> echo "Xorg settings prepended to the system equivalent:"
> echo "--------------------"
> @@ -52,6 +60,8 @@
> echo " XORG_MAKEFLAGS: $XORG_MAKEFLAGS"
> echo " XORG_ACLOCAL_PATH: $XORG_ACLOCAL_PATH"
> echo " XORG_PKG_CONFIG_PATH: $XORG_PKG_CONFIG_PATH"
> +echo " X11_INCLUDE_DIR: $X11_INCLUDE_DIR"
> +echo " X11_LIBRARY_DIR: $X11_LIBRARY_DIR"
> echo ""
>
> set -v || :
>
> to the existing 0.1.2 tarball until a new 0.1.3 tarball can be
> generated. The packaging is on fink tracking at...
>
> https://sourceforge.net/p/fink/package-submissions/4482/
>
> and the change is also posted upstream at...
>
> https://github.com/nieder/fink-buildenv-modules/issues/1
>
> The proposed changes for fink-buildenv-modules-0.1.2-2 have been
> tested with a gcc5 build using the new X11_INCLUDE_DIR and
> X11_LIBRARY_DIR provided by %p/sbin/fink-buildenv-xorg.sh instead of
> the previous hardcoded paths for --x-includes= and --x-libraries= in
> ConfigureParams.
> Jack
------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Fink-devel mailing list
Fink-devel@lists.sourceforge.net
List archive:
http://news.gmane.org/gmane.os.apple.fink.devel
Subscription management:
https://lists.sourceforge.net/lists/listinfo/fink-devel
