Skip to content

Commit

Permalink
Merge pull request #814 from stilor/issue-802
Browse files Browse the repository at this point in the history
Issue 802
  • Loading branch information
stilor committed Aug 26, 2017
2 parents 5494335 + eba1a82 commit f627e74
Show file tree
Hide file tree
Showing 61 changed files with 3,449 additions and 4,079 deletions.
18 changes: 12 additions & 6 deletions config/global/extract.in
Expand Up @@ -52,30 +52,36 @@ config PATCH_BUNDLED

config PATCH_LOCAL
bool
prompt "Local only"
prompt "Local only (EXPERIMENTAL)"
select PATCH_USE_LOCAL
depends on EXPERIMENTAL
help
Only apply your local patches.
Only apply your local patches. Many components require patching
to build or work properly; please review the bundled patches and
copy them into your local directory if needed.

config PATCH_BUNDLED_LOCAL
bool
prompt "Bundled, then local"
select PATCH_USE_LOCAL
help
Apply the patches bundled with crosstool-NG,
then apply your local patches.
Apply the patches bundled with crosstool-NG, then apply your local
patches.

config PATCH_LOCAL_BUNDLED
bool
prompt "Local, then bundled"
select PATCH_USE_LOCAL
depends on EXPERIMENTAL
help
Apply your local patches, then apply the patches
bundled with crosstool-NG.
Apply your local patches, then apply the patches bundled with
crosstool-NG. Note that the bundled patches cannot be guaranteed
to apply on top of your local patches.

config PATCH_NONE
bool
prompt "None"
depends on EXPERIMENTAL
help
Don't use any patch at all.

Expand Down
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
72 changes: 0 additions & 72 deletions packages/glibc-ports/2.14/090-Fix-ARM-build-with-GCC-trunk.patch

This file was deleted.

96 changes: 0 additions & 96 deletions packages/glibc-ports/2.14/330-m68k-sys-user.patch

This file was deleted.

13 changes: 0 additions & 13 deletions packages/glibc-ports/2.14/440-alpha-cache-shape.patch

This file was deleted.

55 changes: 0 additions & 55 deletions packages/glibc-ports/2.14/460-alpha-fix-gcc-4.1-warnings.patch

This file was deleted.

20 changes: 0 additions & 20 deletions packages/glibc-ports/2.14/530-alpha-fix-rtld-fPIC.patch

This file was deleted.

0 comments on commit f627e74

Please sign in to comment.