Skip to content

Commit

Permalink
Make --enable-obsolete-rpc an option in ct-ng
Browse files Browse the repository at this point in the history
Signed-off-by: Alexey Neyman <stilor@att.net>
  • Loading branch information
stilor committed Aug 26, 2017
1 parent bf7641d commit eba1a82
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 3 deletions.
16 changes: 16 additions & 0 deletions config/libc/glibc.in
Expand Up @@ -90,6 +90,15 @@ config GLIBC_NO_SPARC_V8
def_bool y
depends on GLIBC_2_23_or_later

# 2.14 obsoleted Sun RPC code, making it unavailable *at all* for compiling/linking
# (only remained as versioned symbols for previously linked binaries). They backpedaled
# in 2.16, adding an option to enable that code. Crosstool-NG backports that code
# to 2.14/2.15, but there is no harm in throwing this option even if that patch
# is not applied.
config GLIBC_HAS_OBSOLETE_RPC
def_bool y
depends on GLIBC_2_14_or_later

config GLIBC_EXTRA_CONFIG_ARRAY
string
prompt "extra config"
Expand Down Expand Up @@ -123,6 +132,13 @@ config GLIBC_EXTRA_CFLAGS
help
Extra target CFLAGS to use when building.

config GLIBC_ENABLE_OBSOLETE_RPC
bool "Enable obsolete (Sun) RPC"
default y
depends on GLIBC_HAS_OBSOLETE_RPC
help
Allow building applications using obsolete (Sun) RPC.

config GLIBC_ENABLE_FORTIFIED_BUILD
bool
prompt "Enable fortified build (EXPERIMENTAL)"
Expand Down
2 changes: 1 addition & 1 deletion packages/glibc/package.desc
@@ -1,5 +1,5 @@
origin='GNU'
repository='git git://sourceware.org/git/glibc.git'
mirrors='$(CT_Mirrors GNU glibc)'
milestones='2.17 2.20 2.23 2.24'
milestones='2.14 2.17 2.20 2.23 2.24'
archive_formats='.tar.xz .tar.bz2 .tar.gz'
5 changes: 3 additions & 2 deletions scripts/build/libc/glibc.sh
Expand Up @@ -128,8 +128,9 @@ do_libc_backend_once() {
# Also, if those two are missing, iconv build breaks
extra_config+=( --disable-debug --disable-sanity-checks )

# always include rpc, the user can still override it with TI-RPC
extra_config+=( --enable-obsolete-rpc )
if [ "${CT_GLIBC_ENABLE_OBSOLETE_RPC}" = "y" ]; then
extra_config+=( --enable-obsolete-rpc )
fi

# Add some default glibc config options if not given by user.
# We don't need to be conditional on whether the user did set different
Expand Down

0 comments on commit eba1a82

Please sign in to comment.