From 4d3e4116f349c5ae57562ca0dca2fac9c56d12d3 Mon Sep 17 00:00:00 2001 From: Heather Date: Fri, 27 Sep 2013 14:48:27 +0400 Subject: [PATCH 1/3] support for GNU configure syntax --- configure | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/configure b/configure index 70b2bb75a38fc..c2a1b96a58c90 100755 --- a/configure +++ b/configure @@ -391,6 +391,17 @@ valopt target-triples "${CFG_HOST_TRIPLES}" "LLVM target triples" valopt android-cross-path "/opt/ndk_standalone" "Android NDK standalone path" valopt mingw32-cross-path "" "MinGW32 cross compiler path" +#GNUs ./configure musthave syntax +valopt build "${DEFAULT_BUILD_TRIPLE}" "GNUs ./configure syntax LLVM build triple" +valopt host "${CFG_BUILD_TRIPLE}" "GNUs ./configure syntax LLVM host triples" +valopt target "${CFG_HOST_TRIPLES}" "GNUs ./configure syntax LLVM target triples" + +valopt localstatedir "/var/lib" "" +valopt sysconfdir "/etc" "" +valopt datadir "/usr/share" "" +valopt infodir "/usr/share/info" "" +valopt mandir "/usr/share/man" "install man pages in PATH" + # Validate Options step_msg "validating $CFG_SELF args" validate_opt From af7606181c57ead1cc18c593d22cd721837e22a8 Mon Sep 17 00:00:00 2001 From: Heather Date: Sun, 29 Sep 2013 09:20:40 +0400 Subject: [PATCH 2/3] GNU ./configure syntax --libdir --- configure | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure b/configure index c2a1b96a58c90..a047a6337bd74 100755 --- a/configure +++ b/configure @@ -402,6 +402,9 @@ valopt datadir "/usr/share" "" valopt infodir "/usr/share/info" "" valopt mandir "/usr/share/man" "install man pages in PATH" +#Using as /usr/lib64 on 64 bit systems +valopt libdir "/usr/lib" "" + # Validate Options step_msg "validating $CFG_SELF args" validate_opt From 5fdfd38792bcbf17d80323eb50daf09354f5c1c2 Mon Sep 17 00:00:00 2001 From: Heather Date: Wed, 2 Oct 2013 13:05:04 +0400 Subject: [PATCH 3/3] lesser configure changes --- configure | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/configure b/configure index a047a6337bd74..6386c0cef8469 100755 --- a/configure +++ b/configure @@ -385,25 +385,24 @@ opt pax-flags 0 "apply PaX flags to rustc binaries (required for GRSecurity/PaX- valopt prefix "/usr/local" "set installation prefix" valopt local-rust-root "/usr/local" "set prefix for local rust binary" valopt llvm-root "" "set LLVM root" -valopt build-triple "${DEFAULT_BUILD_TRIPLE}" "LLVM build triple" -valopt host-triples "${CFG_BUILD_TRIPLE}" "LLVM host triples" -valopt target-triples "${CFG_HOST_TRIPLES}" "LLVM target triples" valopt android-cross-path "/opt/ndk_standalone" "Android NDK standalone path" valopt mingw32-cross-path "" "MinGW32 cross compiler path" -#GNUs ./configure musthave syntax valopt build "${DEFAULT_BUILD_TRIPLE}" "GNUs ./configure syntax LLVM build triple" valopt host "${CFG_BUILD_TRIPLE}" "GNUs ./configure syntax LLVM host triples" valopt target "${CFG_HOST_TRIPLES}" "GNUs ./configure syntax LLVM target triples" -valopt localstatedir "/var/lib" "" -valopt sysconfdir "/etc" "" -valopt datadir "/usr/share" "" -valopt infodir "/usr/share/info" "" +valopt localstatedir "/var/lib" "local state directory" +valopt sysconfdir "/etc" "install system configuration files" +valopt datadir "/usr/share" "install data" +valopt infodir "/usr/share/info" "install additional info" valopt mandir "/usr/share/man" "install man pages in PATH" +valopt libdir "/usr/lib" "install libraries" -#Using as /usr/lib64 on 64 bit systems -valopt libdir "/usr/lib" "" +#Deprecated opts to keep compatibility +valopt build-triple "${DEFAULT_BUILD_TRIPLE}" "LLVM build triple" +valopt host-triples "${CFG_BUILD_TRIPLE}" "LLVM host triples" +valopt target-triples "${CFG_HOST_TRIPLES}" "LLVM target triples" # Validate Options step_msg "validating $CFG_SELF args"