diff options
| author | Tom Yu <tlyu@mit.edu> | 2006-06-29 04:15:37 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2006-06-29 04:15:37 +0000 |
| commit | 0b1164bc0307d5a708cd4ce981e22d2e372f36f9 (patch) | |
| tree | 999c05347e38a5379ed9cb9e14d781d6af6b0f72 /src/config | |
| parent | 6b86bb400f2e33a59890001c14f67b54075481a2 (diff) | |
| download | krb5-0b1164bc0307d5a708cd4ce981e22d2e372f36f9.tar.gz krb5-0b1164bc0307d5a708cd4ce981e22d2e372f36f9.tar.xz krb5-0b1164bc0307d5a708cd4ce981e22d2e372f36f9.zip | |
back out r18245; it breaks under gcc + GNU ld on Solaris
ticket: 3946
status: open
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@18260 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/lib.in | 7 | ||||
| -rw-r--r-- | src/config/libnover.in | 7 | ||||
| -rw-r--r-- | src/config/shlib.conf | 4 |
3 files changed, 3 insertions, 15 deletions
diff --git a/src/config/lib.in b/src/config/lib.in index b3e612810..5d362743d 100644 --- a/src/config/lib.in +++ b/src/config/lib.in @@ -59,11 +59,6 @@ binutils.versions: $(SHLIB_EXPORT_FILE) Makefile echo >> binutils.versions "};" echo >> binutils.versions "HIDDEN { local: __*; _rest*; _save*; *; };" -solaris.versions: $(SHLIB_EXPORT_FILE) Makefile - echo > solaris.versions "{ global:" - sed >> solaris.versions < $(SHLIB_EXPORT_FILE) "s/$$/;/" - echo >> solaris.versions " local: *; };" - darwin.exports: $(SHLIB_EXPORT_FILE) Makefile sed > darwin-exports.tmp < $(SHLIB_EXPORT_FILE) "s/^/_/" $(MV) darwin-exports.tmp darwin.exports @@ -129,7 +124,7 @@ clean-libs: $(RM) lib$(LIBBASE)$(SHLIBSEXT) $(RM) lib$(LIBBASE)$(SHLIBEXT) $(RM) lib$(LIBBASE)$(PFLIBEXT) - $(RM) binutils.versions osf1.exports solaris.versions + $(RM) binutils.versions osf1.exports clean-liblinks: $(RM) $(TOPLIBD)/lib$(LIBBASE)$(STLIBEXT) diff --git a/src/config/libnover.in b/src/config/libnover.in index a9685136a..09c42dcc8 100644 --- a/src/config/libnover.in +++ b/src/config/libnover.in @@ -48,11 +48,6 @@ binutils.versions: $(SHLIB_EXPORT_FILE) Makefile sed >> binutils.versions < $(SHLIB_EXPORT_FILE) "s/$$/;/" echo >> binutils.versions "};" -solaris.versions: $(SHLIB_EXPORT_FILE) Makefile - echo > solaris.versions "{ global:" - sed >> solaris.versions < $(SHLIB_EXPORT_FILE) "s/$$/;/" - echo >> solaris.versions " local: *; };" - osf1.exports: $(SHLIB_EXPORT_FILE) Makefile $(RM) osf1.tmp osf1.exports sed "s/^/-exported_symbol /" < $(SHLIB_EXPORT_FILE) > osf1.tmp @@ -93,7 +88,7 @@ all-libs: $(LIBBASE)$(DYNOBJEXT) # $(LIBLIST) clean-libs: $(RM) $(LIBBASE)$(SHLIBEXT) - $(RM) binutils.versions osf1.exports solaris.versions + $(RM) binutils.versions osf1.exports install-libs: $(LIBINSTLIST) install-shared: diff --git a/src/config/shlib.conf b/src/config/shlib.conf index 8c3391636..fbd93393a 100644 --- a/src/config/shlib.conf +++ b/src/config/shlib.conf @@ -297,12 +297,10 @@ mips-*-netbsd*) if test "$krb5_cv_prog_gcc" = yes; then PICFLAGS=-fPIC LDCOMBINE='$(CC) $(CFLAGS) -shared -h $(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT)' - LDCOMBINE_TAIL='$(LDFLAGS) -Wl,-M,solaris.versions' else PICFLAGS=-KPIC # Solaris cc doesn't default to stuffing the SONAME field... LDCOMBINE='$(CC) $(CFLAGS) -dy -G -z text -h $(LIBPREFIX)$(LIBBASE)$(SHLIBSEXT) $$initfini' - LDCOMBINE_TAIL='$(LDFLAGS) -M solaris.versions' # case $krb5_cv_host in *-*-solaris2.[1-7] | *-*-solaris2.[1-7].*) @@ -315,7 +313,7 @@ mips-*-netbsd*) ;; esac fi - SHLIB_EXPORT_FILE_DEP=solaris.versions + LDCOMBINE_TAIL='$(LDFLAGS)' SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)' SHLIBSEXT='.so.$(LIBMAJOR)' SHLIBEXT=.so |