diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-12-02 18:33:10 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-12-02 18:33:10 +0000 |
| commit | a7e7b34a73068a65cdb534a82b6ed7e611867783 (patch) | |
| tree | 161282265e2769ceb00b5c3cf6278d7793385e5b | |
| parent | 9284dbf5257b70efa4da2f3a024519c6deb3a344 (diff) | |
| download | ruby-a7e7b34a73068a65cdb534a82b6ed7e611867783.tar.gz ruby-a7e7b34a73068a65cdb534a82b6ed7e611867783.tar.xz ruby-a7e7b34a73068a65cdb534a82b6ed7e611867783.zip | |
* configure.in: apply patch from NetBSD's pkgsrc (patch-aa).
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 26 |
2 files changed, 16 insertions, 14 deletions
@@ -1,3 +1,7 @@ +Mon Dec 3 03:32:22 2001 Usaku Nakamura <usa@ruby-lang.org> + + * configure.in: apply patch from NetBSD's pkgsrc (patch-aa). + Sun Dec 2 22:01:52 2001 WATANABE Hirofumi <eban@ruby-lang.org> * configure.in: use GCC, not without_gcc. remove without_gcc. diff --git a/configure.in b/configure.in index 57aee1031..955720a5e 100644 --- a/configure.in +++ b/configure.in @@ -559,12 +559,7 @@ if test "$with_dln_a_out" != yes; then beos*) ;; cygwin*) ;; mingw*) ;; - netbsd*) CCDLFLAGS=-fpic - case "$target_cpu" in - mips*) CCDLFLAGS=-fPIC ;; - sparc) CCDLFLAGS=-fPIC ;; - *) ;; - esac ;; + netbsd*) CCDLFLAGS=-fPIC;; *) CCDLFLAGS=-fPIC;; esac else @@ -611,10 +606,8 @@ if test "$with_dln_a_out" != yes; then test "$GCC" = yes && `$CC --print-prog-name=ld` -v 2>&1 | grep "GNU ld" > /dev/null || LDSHARED="ld -Bshareable" fi rb_cv_dlopen=yes ;; - netbsd*) LDSHARED="ld -shared" - if test "$rb_cv_binary_elf" = yes; then - LDFLAGS="-export-dynamic" - fi + netbsd*) LDSHARED='${CC} -shared' + LDFLAGS="" rb_cv_dlopen=yes ;; openbsd*) LDSHARED="ld -Bforcearchive -Bshareable" rb_cv_dlopen=yes ;; @@ -885,11 +878,13 @@ if test "$enable_shared" = 'yes'; then ;; netbsd*) SOLIBS='$(LIBS)' - LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR)' + LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' + LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR)' + LIBRUBYARG='-Wl,-R -Wl,${prefix}/lib -L${prefix}/lib -L. -l$(RUBY_INSTALL_NAME) -Wl,-R -Wl,${X11BASE}/lib -L${X11BASE}/lib' if test "$rb_cv_binary_elf" = yes; then # ELF platforms - LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR) lib$(RUBY_INSTALL_NAME).so' - else - LIBRUBY_ALIASES= # a.out platforms + LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_INSTALL_NAME).so' + else # a.out platforms + LIBRUBY_ALIASES="" fi ;; openbsd*) @@ -933,6 +928,9 @@ if test "$enable_shared" = 'yes'; then fi case "$target_os" in + netbsd*) + CFLAGS="$CFLAGS -pipe" + ;; nextstep*) CFLAGS="$CFLAGS -pipe" ;; |