mirror of
https://git.freebsd.org/ports.git
synced 2025-06-30 09:00:33 -04:00
02f27a83b4
locale set by the user. Add LANG=C and LC_ALL=C at the beginning of bsd.port.mk and export them so all commands are executed with the C locale. LC_ALL=C overrides all other LC_* variables. LANG is used by setlocale(3) as default value for LC_* variables, so normally it isn't used when LC_ALL is set, but there's code out there that looks at LANG directly so it's safer to set it as well. The only commands not captured by this are != assignments before any inclusion of bsd.port.*mk. Introduce USE_LOCALE=<locale> that adds LANG=<locale> and LC_ALL=<locale> to CONFIGURE_ENV and MAKE_ENV so upstream build systems can be executed with a different locale (e.g. USE_LOCALE=en_US.UTF-8). PR: 215882 Exp-run by: antoine Approved by: portmgr (antoine)
26 lines
914 B
Text
26 lines
914 B
Text
--- build.orig 2015-11-05 18:10:02 UTC
|
|
+++ build
|
|
@@ -51,7 +51,7 @@ if [ -f conf/util/configure ]; then
|
|
if [ `uname -s` = Darwin -a -d /opt/X11 ]; then
|
|
util/configure --x-includes=/opt/X11/include --x-libraries=/opt/X11/lib -srcdir .
|
|
else
|
|
- util/configure -srcdir .
|
|
+ util/configure --prefix=${PREFIX} --x-includes=${LOCALBASE}/include --x-libraries=${LOCALBASE}/lib -srcdir .
|
|
fi
|
|
|
|
if [ ! -f ../src/include/config.h ] || \
|
|
@@ -102,8 +102,14 @@ if [ -f conf/mkheader ]; then
|
|
fi
|
|
echo Creating makefiles in the subdirectories...
|
|
$makeprog make
|
|
+ if [ $? -ne 0 ]; then
|
|
+ exit $?
|
|
+ fi
|
|
echo ...done
|
|
$makeprog all 2> ../../errs
|
|
+ if [ $? -ne 0 ]; then
|
|
+ exit $?
|
|
+ fi
|
|
echo done
|
|
echo Check the errs file for any problems.
|
|
echo To finish the installation, cd to src/bin, become root, and type
|