зеркало из https://github.com/mozilla/pjs.git
Bugzilla Bug 261649: more changes for GNU/k*BSD and GNU/Hurd support.
The patch is contributed by Robert Millan <rmh@aybabtu.com>. r=wtc. Modified files: nsinstall.c _pth.h pr/src/linking/Makefile.in prlink.c pr/tests/Makefile.in
This commit is contained in:
Родитель
7d5638e978
Коммит
2e6563f4e6
|
@ -98,7 +98,7 @@ my_getcwd (char *buf, size_t size)
|
||||||
}
|
}
|
||||||
#endif /* NEXTSTEP */
|
#endif /* NEXTSTEP */
|
||||||
|
|
||||||
#ifdef LINUX
|
#if defined(LINUX) || defined(__GNU__) || defined(__GLIBC__)
|
||||||
#include <getopt.h>
|
#include <getopt.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -200,7 +200,8 @@
|
||||||
/*
|
/*
|
||||||
* These platforms don't have sigtimedwait()
|
* These platforms don't have sigtimedwait()
|
||||||
*/
|
*/
|
||||||
#if (defined(AIX) && !defined(AIX4_3_PLUS)) || defined(LINUX) \
|
#if (defined(AIX) && !defined(AIX4_3_PLUS)) \
|
||||||
|
|| defined(LINUX) || defined(__GNU__)|| defined(__GLIBC__) \
|
||||||
|| defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
|
|| defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
|
||||||
|| defined(BSDI) || defined(VMS) || defined(UNIXWARE) \
|
|| defined(BSDI) || defined(VMS) || defined(UNIXWARE) \
|
||||||
|| defined(DARWIN)
|
|| defined(DARWIN)
|
||||||
|
|
|
@ -63,7 +63,7 @@ TARGETS = $(OBJS)
|
||||||
INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
|
INCLUDES = -I$(dist_includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
|
||||||
|
|
||||||
# For Dl_info and dladdr.
|
# For Dl_info and dladdr.
|
||||||
ifeq (,$(filter-out Linux GNU GNU_kFreeBSD GNU_kNetBSD,$(OS_TARGET)))
|
ifeq (,$(filter-out Linux GNU GNU_%,$(OS_TARGET)))
|
||||||
DEFINES += -D_GNU_SOURCE
|
DEFINES += -D_GNU_SOURCE
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -1389,7 +1389,7 @@ PR_IMPLEMENT(char *)
|
||||||
PR_GetLibraryFilePathname(const char *name, PRFuncPtr addr)
|
PR_GetLibraryFilePathname(const char *name, PRFuncPtr addr)
|
||||||
{
|
{
|
||||||
#if defined(SOLARIS) || defined(FREEBSD) \
|
#if defined(SOLARIS) || defined(FREEBSD) \
|
||||||
|| defined(LINUX) || defined(__GLIBC__)
|
|| defined(LINUX) || defined(__GNU__) || defined(__GLIBC__)
|
||||||
Dl_info dli;
|
Dl_info dli;
|
||||||
char *result;
|
char *result;
|
||||||
|
|
||||||
|
|
|
@ -376,7 +376,7 @@ ifeq ($(OS_ARCH), NEWS-OS)
|
||||||
EXTRA_LIBS = -lsocket -lnsl -lgen -lresolv
|
EXTRA_LIBS = -lsocket -lnsl -lgen -lresolv
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq (,$(filter-out Linux GNU GNU_kFreeBSD GNU_kNetBSD,$(OS_ARCH)))
|
ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH)))
|
||||||
LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR)
|
LDOPTS += -Xlinker -rpath $(ABSOLUTE_LIB_DIR)
|
||||||
ifeq ($(USE_PTHREADS),1)
|
ifeq ($(USE_PTHREADS),1)
|
||||||
EXTRA_LIBS = -lpthread
|
EXTRA_LIBS = -lpthread
|
||||||
|
|
Загрузка…
Ссылка в новой задаче