pkgsrc-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

MACHINE_ARCH is now i386 on Darwin with ABI=64 (should be x86_64?)


With these changes, my Darwin host, with ABI=64, now builds packages
that has "MACHINE_ARCH=i386" rather than x86_64.  Do I need to set
MACHINE_ARCH in mk.conf?  Or do I need to blow everything away and
re-run the bootstrap?


On Sun, Jan 24, 2016 at 04:14:45PM +0000, Jonathan Perkin wrote:
> Module Name:	pkgsrc
> Committed By:	jperkin
> Date:		Sun Jan 24 16:14:45 UTC 2016
> Modified Files:
> 	pkgsrc/bootstrap: bootstrap
> 	pkgsrc/devel/bmake: Makefile
> 	pkgsrc/devel/bmake/files: main.c
> 	pkgsrc/graphics/evas: Makefile.common
> 	pkgsrc/lang/gcc34: Makefile
> 	pkgsrc/lang/gcc44: Makefile
> 	pkgsrc/lang/gcc45: Makefile
> 	pkgsrc/lang/gcc46: Makefile
> 	pkgsrc/lang/sbcl: Makefile
> 	pkgsrc/mk:
> 	pkgsrc/mk/defaults: mk.conf
> 	pkgsrc/net/traceroute-nanog: Makefile
> 	pkgsrc/news/nn: Makefile
> 	pkgsrc/security/john: Makefile
> 	pkgsrc/security/libbf: Makefile
> 	pkgsrc/security/openssl: Makefile
> 	pkgsrc/x11/elementary: Makefile
> 	pkgsrc/x11/enlightenment: Makefile
> Log Message:
> Attempt to bring sanity to how ABI and MACHINE_ARCH are set.
> Previously there were at least 5 different ways MACHINE_ARCH could be set,
> some statically and some at run time, and in many cases these settings
> differed, leading to issues at pkg_add time where there was conflict
> between the setting encoded into the package and that used by pkg_install.
> Instead, move to a single source of truth where the correct value based on
> the host and the chosen (or default) ABI is determined in the bootstrap
> script.  The value can still be overridden in mk.conf if necessary, e.g.
> for cross-compiling.
> ABI is now set by default and if unset a default is calculated based on
> MACHINE_ARCH.  This fixes some OS, e.g. Linux, where the wrong default was
> previously chosen.
> As a result of the refactoring there is no need for LOWER_ARCH, with
> references to it replaced by MACHINE_ARCH.  SPARC_TARGET_ARCH is also
> removed.
> To generate a diff of this commit:
> cvs rdiff -u -r1.226 -r1.227 pkgsrc/bootstrap/bootstrap
> cvs rdiff -u -r1.71 -r1.72 pkgsrc/devel/bmake/Makefile
> cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/bmake/files/main.c
> cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/bmake/files/
> cvs rdiff -u -r1.14 -r1.15 pkgsrc/graphics/evas/Makefile.common
> cvs rdiff -u -r1.56 -r1.57 pkgsrc/lang/gcc34/Makefile
> cvs rdiff -u -r1.44 -r1.45 pkgsrc/lang/gcc44/Makefile
> cvs rdiff -u -r1.19 -r1.20 pkgsrc/lang/gcc45/Makefile
> cvs rdiff -u -r1.28 -r1.29 pkgsrc/lang/gcc46/Makefile
> cvs rdiff -u -r1.63 -r1.64 pkgsrc/lang/sbcl/Makefile
> cvs rdiff -u -r1.375 -r1.376 pkgsrc/mk/
> cvs rdiff -u -r1.261 -r1.262 pkgsrc/mk/defaults/mk.conf
> cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/traceroute-nanog/Makefile
> cvs rdiff -u -r1.46 -r1.47 pkgsrc/news/nn/Makefile
> cvs rdiff -u -r1.22 -r1.23 pkgsrc/security/john/Makefile
> cvs rdiff -u -r1.16 -r1.17 pkgsrc/security/libbf/Makefile
> cvs rdiff -u -r1.218 -r1.219 pkgsrc/security/openssl/Makefile
> cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/elementary/Makefile
> cvs rdiff -u -r1.36 -r1.37 pkgsrc/x11/enlightenment/Makefile
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.

Andreas Kusalananda Kähäri, Bioinformatics Developer, Uppsala, Sweden
OpenPGP: url=; id=46082BDF

Attachment: signature.asc
Description: PGP signature

Home | Main Index | Thread Index | Old Index