OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1999-03-19 Andreas Jaeger <aj@arthur.rhein-neckar.de>

Browse Source 
* rt/Makefile: Link against static library if no shared lib is 
available. 
* localedata/Makefile: The shells scripts implementing the test  
require the dynamic linker which is not available with  
--disable-shared.  Skip the test if --disable-shared is given. 
* linuxthreads/Makefile: Link test against static libpthread if no  
shared lib is available. 
* iconvdata/Makefile (tests): Run iconv-test only if we're 
building shared libraries. 
* elf/Makefile (tests): Likewise for elf tests. 
* posix/Makefile: The test frameworks globtest and wordexp-test 
require the dynamic linker which is not available with 
--disable-shared.  Skip the test if --disable-shared is given. 
* grp/Makefile (otherlibs): For static nss build link against 
necessary libs.
	* rt/Makefile: Link against static library if no shared lib is
	available.

	* localedata/Makefile: The shells scripts implementing the test
 	require the dynamic linker which is not available with
 	--disable-shared.  Skip the test if --disable-shared is given.

	* linuxthreads/Makefile: Link test against static libpthread if no 
 	shared lib is available.

	* iconvdata/Makefile (tests): Run iconv-test only if we're
	building shared libraries.
	* elf/Makefile (tests): Likewise for elf tests.

	* posix/Makefile: The test frameworks globtest and wordexp-test
	require the dynamic linker which is not available with
	--disable-shared.  Skip the test if --disable-shared is given.

	* grp/Makefile (otherlibs): For static nss build link against
	necessary libs.

1999-03-19  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
This commit is contained in:
Andreas Schwab 1999-03-20 17:16:44 +00:00
parent bfe1b52846
commit df455ccb63
7 changed files with 59 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ChangeLog
View File

@ -1,3 +1,26 @@
1999-03-19 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* rt/Makefile: Link against static library if no shared lib is
available.
* localedata/Makefile: The shells scripts implementing the test
require the dynamic linker which is not available with
--disable-shared. Skip the test if --disable-shared is given.
* linuxthreads/Makefile: Link test against static libpthread if no
shared lib is available.
* iconvdata/Makefile (tests): Run iconv-test only if we're
building shared libraries.
* elf/Makefile (tests): Likewise for elf tests.
* posix/Makefile: The test frameworks globtest and wordexp-test
require the dynamic linker which is not available with
--disable-shared. Skip the test if --disable-shared is given.
* grp/Makefile (otherlibs): For static nss build link against
necessary libs.
1999-03-19 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* debug/Makefile (install-bin): Install and build catchsegv only

8
grp/Makefile
View File

@ -1,4 +1,4 @@
# Copyright (C) 1991, 1992, 1996, 1997, 1998 Free Software Foundation, Inc.
# Copyright (C) 1991, 1992, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@ -30,6 +30,12 @@ tests := testgrp
include ../Rules
ifeq (yes,$(build-static-nss))
otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \
$(resolvobjdir)/libresolv.a
endif
ifeq ($(have-thread-library),yes)
CFLAGS-getgrgid_r.c = -DUSE_NSCD=1

2
iconvdata/Makefile
View File

@ -232,7 +232,9 @@ endif # build-shared = yes
include ../Rules
ifeq (yes,$(build-shared))
tests: $(objpfx)iconv-test.out
endif
$(objpfx)iconv-test.out: run-iconv-test.sh $(objpfx)gconv-modules \
$(addprefix $(objpfx),$(modules.so)) \

20
linuxthreads/Makefile
View File

@ -1,4 +1,4 @@
# Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
# Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@ -53,9 +53,15 @@ CFLAGS-cancel.c += -D__NO_WEAK_PTHREAD_ALIASES
$(objpfx)libpthread.so: $(common-objpfx)libc.so
# Make sure we link with the thread library.
$(objpfx)ex1: $(objpfx)libpthread.so
$(objpfx)ex2: $(objpfx)libpthread.so
$(objpfx)ex3: $(objpfx)libpthread.so
$(objpfx)ex4: $(objpfx)libpthread.so
$(objpfx)ex5: $(objpfx)libpthread.so
$(objpfx)ex6: $(objpfx)libpthread.so
ifeq ($(build-shared),yes)
libpthread = $(objpfx)libpthread.so
else
libpthread = $(objpfx)libpthread.a
endif
$(objpfx)ex1: $(libpthread)
$(objpfx)ex2: $(libpthread)
$(objpfx)ex3: $(libpthread)
$(objpfx)ex4: $(libpthread)
$(objpfx)ex5: $(libpthread)
$(objpfx)ex6: $(libpthread)

2
localedata/Makefile
View File

@ -69,6 +69,7 @@ $(inst_i18ndir)/repertoiremaps/%: repertoiremaps/% $(+force); $(do-install)
ifeq (no,$(cross-compiling))
ifeq (yes,$(build-shared))
.PHONY: do-collate-test do-tst-fmon do-tst-locale do-tst-rpmatch
tests: do-collate-test do-tst-fmon do-tst-locale do-tst-rpmatch
do-collate-test: sort-test.sh $(objpfx)collate-test $(objpfx)xfrm-test \
@ -81,6 +82,7 @@ do-tst-locale: tst-locale.sh $(ld-test-srcs)
do-tst-rpmatch: tst-rpmatch.sh $(objpfx)tst-rpmatch do-tst-fmon
$(SHELL) -e $< $(common-objpfx)
endif
endif
# Sometimes the whole collection of locale files should be installed.
LOCALEDEF=$(common-objpfx)elf/ld.so --library-path $(rpath-link) $(common-objpfx)locale/localedef

8
posix/Makefile
View File

@ -56,9 +56,12 @@ routines := \
include ../Makeconfig
aux := init-posix environ
tests := tstgetopt testfnm runtests wordexp-test runptests \
tests := tstgetopt testfnm runtests runptests \
tst-preadwrite test-vfork
ifeq (yes,$(build-shared))
test-srcs := globtest
tests += wordexp-test
endif
others := getconf
install-bin := getconf
ifeq (yes,$(build-static))
@ -75,6 +78,8 @@ generated := $(addprefix wordexp-test-result, 1 2 3 4 5 6 7 8 9 10) \
include ../Rules
ifeq (no,$(cross-compiling))
# globtest and wordexp-test currently only works with shared libraries
ifeq (yes,$(build-shared))
.PHONY: do-globtest do-wordexp-test
tests: do-globtest do-wordexp-test
do-globtest: $(objpfx)globtest
@ -84,6 +89,7 @@ do-wordexp-test: $(objpfx)wordexp-test
$(SHELL) -e wordexp-tst.sh $(common-objpfx) $(elf-objpfx) \
$(rtld-installed-name)
endif
endif
CFLAGS-regex.c = -Wno-unused -Wno-strict-prototypes
CFLAGS-getaddrinfo.c = -DRESOLVER

6
rt/Makefile
View File

@ -1,4 +1,4 @@
# Copyright (C) 1997, 1998 Free Software Foundation, Inc.
# Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@ -49,4 +49,8 @@ include ../Rules
# a statically-linked program that hasn't already loaded it.
$(objpfx)librt.so: $(common-objpfx)libc.so $(shared-thread-library)
ifeq (yes,$(build-shared))
$(objpfx)tst-aio: $(objpfx)librt.so $(shared-thread-library)
else
$(objpfx)tst-aio: $(objpfx)librt.a $(static-thread-library)
endif