diff options
Diffstat (limited to 'lang/ruby16-base/patches/patch-aa')
| -rw-r--r-- | lang/ruby16-base/patches/patch-aa | 50 |
1 files changed, 37 insertions, 13 deletions
diff --git a/lang/ruby16-base/patches/patch-aa b/lang/ruby16-base/patches/patch-aa index 59337e2bbf9..b57698859eb 100644 --- a/lang/ruby16-base/patches/patch-aa +++ b/lang/ruby16-base/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ +$NetBSD: patch-aa,v 1.1.1.1.4.1 2005/09/22 16:56:47 salo Exp $ ---- configure.in.orig 2002-11-13 13:59:18.000000000 -0500 +--- configure.in.orig 2002-11-13 18:59:18.000000000 +0000 +++ configure.in @@ -264,6 +264,8 @@ os2_emx*) LIBS="-lm $LIBS" ac_cv_lib_dir_opendir=no;; @@ -11,7 +11,17 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ freebsd*) LIBS="-lm $LIBS" AC_CACHE_CHECK([whether -lxpg4 has to be linked], rb_cv_lib_xpg4_needed, -@@ -324,7 +326,8 @@ AC_HEADER_STDC +@@ -300,6 +302,9 @@ freebsd*) LIBS="-lm $LIBS" + fi + fi + ;; ++dragonfly*) LIBS="-lm $LIBS" ++ MAINLIBS="-pthread $MAINLIBS" ++ ;; + linux*) LIBS="-lm $LIBS" + case "$target_cpu" in + alpha*) +@@ -324,7 +329,8 @@ AC_HEADER_STDC AC_HEADER_SYS_WAIT AC_CHECK_HEADERS(stdlib.h string.h unistd.h limits.h sys/file.h sys/ioctl.h\ fcntl.h sys/fcntl.h sys/select.h sys/time.h sys/times.h sys/param.h\ @@ -21,7 +31,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ dnl Checks for typedefs, structures, and compiler characteristics. AC_TYPE_UID_T -@@ -456,6 +459,49 @@ else +@@ -456,6 +462,49 @@ else AC_DEFINE_UNQUOTED(FILE_COUNT, $rb_cv_fcnt) fi @@ -71,7 +81,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ dnl default value for $KANJI DEFAULT_KCODE="KCODE_NONE" -@@ -549,6 +595,7 @@ if test "$with_dln_a_out" != yes; then +@@ -549,6 +598,7 @@ if test "$with_dln_a_out" != yes; then cygwin*) ;; mingw*) ;; netbsd*) CCDLFLAGS=-fPIC;; @@ -79,7 +89,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ *) CCDLFLAGS=-fPIC;; esac else -@@ -563,7 +610,7 @@ if test "$with_dln_a_out" != yes; then +@@ -563,7 +613,7 @@ if test "$with_dln_a_out" != yes; then case "$target_os" in hpux*) DLDFLAGS="-E" @@ -88,7 +98,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ LDFLAGS="-Wl,-E" rb_cv_dlopen=yes;; solaris*) if test "$GCC" = yes; then -@@ -578,7 +625,8 @@ if test "$with_dln_a_out" != yes; then +@@ -578,7 +628,8 @@ if test "$with_dln_a_out" != yes; then rb_cv_dlopen=yes;; sunos*) LDSHARED='ld -assert nodefinitions' rb_cv_dlopen=yes;; @@ -98,7 +108,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ rb_cv_dlopen=yes;; sysv4*) LDSHARED='ld -G' rb_cv_dlopen=yes;; -@@ -589,6 +637,12 @@ if test "$with_dln_a_out" != yes; then +@@ -589,6 +640,12 @@ if test "$with_dln_a_out" != yes; then osf*) LDSHARED="$CC -shared" rb_cv_dlopen=yes ;; linux*) LDSHARED="$CC -shared" @@ -111,8 +121,13 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ rb_cv_dlopen=yes ;; freebsd*) LDSHARED="$CC -shared" if test "$rb_cv_binary_elf" = yes; then -@@ -601,8 +655,18 @@ if test "$with_dln_a_out" != yes; then - netbsd*) LDSHARED='${CC} -shared' +@@ -598,11 +655,22 @@ if test "$with_dln_a_out" != yes; then + test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable" + fi + rb_cv_dlopen=yes ;; +- netbsd*) LDSHARED='${CC} -shared' ++ dragonfly*|netbsd*) ++ LDSHARED='${CC} -shared' if test "$rb_cv_binary_elf" = yes; then LDFLAGS="-Wl,-export-dynamic" + DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)' @@ -130,7 +145,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ openbsd*) LDSHARED="ld -Bforcearchive -Bshareable" rb_cv_dlopen=yes ;; bsdi3*) case "$CC" in -@@ -858,6 +922,7 @@ if test "$enable_shared" = 'yes'; then +@@ -858,6 +926,7 @@ if test "$enable_shared" = 'yes'; then ;; linux*) LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR)' @@ -138,7 +153,16 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_INSTALL_NAME).so' ;; freebsd*) -@@ -879,6 +944,14 @@ if test "$enable_shared" = 'yes'; then +@@ -868,7 +937,7 @@ if test "$enable_shared" = 'yes'; then + LIBRUBY_ALIASES='' + fi + ;; +- netbsd*) ++ dragonfly*|netbsd*) + SOLIBS='$(LIBS)' + LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' + LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR)' +@@ -879,6 +948,14 @@ if test "$enable_shared" = 'yes'; then LIBRUBY_ALIASES="" fi ;; @@ -153,7 +177,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/03/06 16:36:08 taca Exp $ openbsd*) SOLIBS='$(LIBS)' ;; -@@ -1071,6 +1144,10 @@ if test "$search_path" != ""; then +@@ -1071,6 +1148,10 @@ if test "$search_path" != ""; then AC_DEFINE_UNQUOTED(RUBY_SEARCH_PATH,"$search_path") fi |