[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Patches] pkgversion/bugurl configure resync
- To: <patches@xxxxxxxxxx>
- Subject: [Patches] pkgversion/bugurl configure resync
- From: "Joseph S. Myers" <joseph@xxxxxxxxxxxxxxxx>
- Date: Sat, 17 Nov 2012 17:56:34 +0000
I've applied this patch to make the pkgversion/bugurl configure code in
EGLIBC closer to that in glibc.
Index: configure.in
===================================================================
--- configure.in (revision 21776)
+++ configure.in (working copy)
@@ -5,6 +5,13 @@
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR([scripts])
+ACX_PKGVERSION([EGLIBC])
+ACX_BUGURL([http://www.eglibc.org/issues/])
+AC_DEFINE_UNQUOTED([PKGVERSION], ["$PKGVERSION"],
+ [Package description])
+AC_DEFINE_UNQUOTED([REPORT_BUGS_TO], ["$REPORT_BUGS_TO"],
+ [Bug reporting address])
+
# Glibc should not depend on any header files
AC_DEFUN([_AC_INCLUDES_DEFAULT_REQUIREMENTS],
[m4_divert_text([DEFAULTS],
@@ -218,11 +225,6 @@
[])
AC_SUBST(all_warnings)
-ACX_PKGVERSION([EGLIBC])
-ACX_BUGURL([http://www.eglibc.org/issues/])
-AC_DEFINE_UNQUOTED([PKGVERSION], ["$PKGVERSION"], [Additional package description])
-AC_DEFINE_UNQUOTED([REPORT_BUGS_TO], ["$REPORT_BUGS_TO"], [Bug reporting address])
-
AC_ARG_ENABLE([multi-arch],
AC_HELP_STRING([--enable-multi-arch],
[enable single DSO with optimizations for multiple architectures]),
Index: configure
===================================================================
--- configure (revision 21776)
+++ configure (working copy)
@@ -656,10 +656,6 @@
build_nscd
link_obsolete_rpc
libc_cv_nss_crypt
-REPORT_BUGS_TEXI
-REPORT_BUGS_TO
-PKGVERSION_TEXI
-PKGVERSION
all_warnings
force_install
bindnow
@@ -689,6 +685,10 @@
build_cpu
build
subdirs
+REPORT_BUGS_TEXI
+REPORT_BUGS_TO
+PKGVERSION_TEXI
+PKGVERSION
target_alias
host_alias
build_alias
@@ -730,6 +730,8 @@
ac_subst_files=''
ac_user_opts='
enable_option_checking
+with_pkgversion
+with_bugurl
with_gd
with_gd_include
with_gd_lib
@@ -751,8 +753,6 @@
enable_force_install
enable_kernel
enable_all_warnings
-with_pkgversion
-with_bugurl
enable_multi_arch
enable_nss_crypt
enable_obsolete_rpc
@@ -1423,6 +1423,8 @@
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
+ --with-pkgversion=PKG Use PKG in the version string in place of "EGLIBC"
+ --with-bugurl=URL Direct users to URL to report a bug
--with-gd=DIR find libgd include dir and library with prefix DIR
--with-gd-include=DIR find libgd include files in DIR
--with-gd-lib=DIR find libgd library files in DIR
@@ -1432,8 +1434,6 @@
--with-headers=PATH location of system headers to use (for example
/usr/src/linux/include) [default=compiler default]
--with-default-link do not use explicit linker scripts
- --with-pkgversion=PKG Use PKG in the version string in place of "EGLIBC"
- --with-bugurl=URL Direct users to URL to report a bug
--with-cpu=CPU select code for CPU variant
Some influential environment variables:
@@ -2293,6 +2293,64 @@
+
+
+# Check whether --with-pkgversion was given.
+if test "${with_pkgversion+set}" = set; then :
+ withval=$with_pkgversion; case "$withval" in
+ yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;;
+ no) PKGVERSION= ;;
+ *) PKGVERSION="($withval) " ;;
+ esac
+else
+ PKGVERSION="(EGLIBC) "
+
+fi
+
+ PKGVERSION_TEXI=`echo "$PKGVERSION" | sed 's/@/@@/g'`
+
+
+
+
+
+# Check whether --with-bugurl was given.
+if test "${with_bugurl+set}" = set; then :
+ withval=$with_bugurl; case "$withval" in
+ yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;;
+ no) BUGURL=
+ ;;
+ *) BUGURL="$withval"
+ ;;
+ esac
+else
+ BUGURL="http://www.eglibc.org/issues/";
+
+fi
+
+ case ${BUGURL} in
+ "")
+ REPORT_BUGS_TO=
+ REPORT_BUGS_TEXI=
+ ;;
+ *)
+ REPORT_BUGS_TO="<$BUGURL>"
+ REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`}
+ ;;
+ esac;
+
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define PKGVERSION "$PKGVERSION"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define REPORT_BUGS_TO "$REPORT_BUGS_TO"
+_ACEOF
+
+
# Glibc should not depend on any header files
@@ -3724,64 +3782,6 @@
-
-
-# Check whether --with-pkgversion was given.
-if test "${with_pkgversion+set}" = set; then :
- withval=$with_pkgversion; case "$withval" in
- yes) as_fn_error $? "package version not specified" "$LINENO" 5 ;;
- no) PKGVERSION= ;;
- *) PKGVERSION="($withval) " ;;
- esac
-else
- PKGVERSION="(EGLIBC) "
-
-fi
-
- PKGVERSION_TEXI=`echo "$PKGVERSION" | sed 's/@/@@/g'`
-
-
-
-
-
-# Check whether --with-bugurl was given.
-if test "${with_bugurl+set}" = set; then :
- withval=$with_bugurl; case "$withval" in
- yes) as_fn_error $? "bug URL not specified" "$LINENO" 5 ;;
- no) BUGURL=
- ;;
- *) BUGURL="$withval"
- ;;
- esac
-else
- BUGURL="http://www.eglibc.org/issues/";
-
-fi
-
- case ${BUGURL} in
- "")
- REPORT_BUGS_TO=
- REPORT_BUGS_TEXI=
- ;;
- *)
- REPORT_BUGS_TO="<$BUGURL>"
- REPORT_BUGS_TEXI=@uref{`echo "$BUGURL" | sed 's/@/@@/g'`}
- ;;
- esac;
-
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define PKGVERSION "$PKGVERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define REPORT_BUGS_TO "$REPORT_BUGS_TO"
-_ACEOF
-
-
# Check whether --enable-multi-arch was given.
if test "${enable_multi_arch+set}" = set; then :
enableval=$enable_multi_arch; multi_arch=$enableval
Index: ChangeLog.eglibc
===================================================================
--- ChangeLog.eglibc (revision 21776)
+++ ChangeLog.eglibc (working copy)
@@ -1,5 +1,10 @@
2012-11-17 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+ * configure.in: Resync pkgversion/bugurl code closer with glibc.
+ * configure: Regenerated.
+
+2012-11-17 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
* elf/dl-reloc.c, include/features.h, io/sys/stat.h,
ports/sysdeps/mips/dl-machine.h: Revert unnecessary differences
from glibc.
--
Joseph S. Myers
joseph@xxxxxxxxxxxxxxxx
_______________________________________________
Patches mailing list
Patches@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/patches