diff options
author | jperkin <jperkin> | 2015-05-26 12:19:46 +0000 |
---|---|---|
committer | jperkin <jperkin> | 2015-05-26 12:19:46 +0000 |
commit | 4854a2627538a3f6106a83fe6b75add6ee739199 (patch) | |
tree | dbba03d08adcd3c0567adad290567f758959cf63 /lang | |
parent | cf143a3832a34f9716a516ffbecc39ef588369e4 (diff) | |
download | pkgsrc-4854a2627538a3f6106a83fe6b75add6ee739199.tar.gz |
Put back SunOS support, and update for 4.0. Build now completes but
install fails due to PLIST errors with the new libmono-2.0 handling.
Need to verify this on other platforms before fixing.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/mono/Makefile | 5 | ||||
-rw-r--r-- | lang/mono/distinfo | 6 | ||||
-rw-r--r-- | lang/mono/patches/patch-configure | 38 | ||||
-rw-r--r-- | lang/mono/patches/patch-mono_utils_Makefile.in | 18 |
4 files changed, 36 insertions, 31 deletions
diff --git a/lang/mono/Makefile b/lang/mono/Makefile index 2ad000bdbd6..5a1dd39feb0 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.159 2015/05/26 12:15:49 jperkin Exp $ +# $NetBSD: Makefile,v 1.160 2015/05/26 12:19:46 jperkin Exp $ DISTNAME= mono-4.0.1 PKGREVISION= 1 @@ -17,7 +17,7 @@ ALL_ENV+= MONO_SHARED_DIR=${WRKDIR:Q} PLATFORM= USE_TOOLS+= bash:run bison gmake gtar msgfmt perl:run pkg-config USE_LIBTOOL= yes -USE_LANGUAGES+= c c++ +USE_LANGUAGES+= c c99 c++ EXTRACT_USING= gtar GNU_CONFIGURE= yes @@ -137,6 +137,7 @@ PLIST_VARS= monodoc .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" +CFLAGS+= -D_XOPEN_SOURCE=600 CONFIGURE_ARGS+= --with-mcs-docs=no CONFIGURE_ENV+= ac_cv_func_getdomainname=no CONFIGURE_ENV+= ac_cv_func_setdomainname=no diff --git a/lang/mono/distinfo b/lang/mono/distinfo index 1e23dfcfb3e..d1590bf4b95 100644 --- a/lang/mono/distinfo +++ b/lang/mono/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.101 2015/05/23 06:20:20 kefren Exp $ +$NetBSD: distinfo,v 1.102 2015/05/26 12:19:46 jperkin Exp $ SHA1 (mono-4.0.1.tar.bz2) = 9c7c27caa69e6a1673753437fd6824e0d33fe2ac RMD160 (mono-4.0.1.tar.bz2) = 3adcb49d7da9a4d81b7f5bc2108d13c20d94ab15 @@ -23,7 +23,7 @@ SHA1 (patch-be) = d1b603478ff8b1acdd2160efe2d88974f62ac20f SHA1 (patch-bf) = 550c198e41ccc33dd690950754af4557df9b1d1d SHA1 (patch-bi) = 4d2252c53facafeb8fc7f459759294da5f14dfeb SHA1 (patch-cc) = d26c9e04f04896f0e7b2edab61cd347d76e0fcaf -SHA1 (patch-configure) = c8364cd9da06b6b8d15a3d98c1e4cb11a29c1298 +SHA1 (patch-configure) = 52cc34a703269505175cbba54bdd0a80fed9b2d0 SHA1 (patch-da) = 08c7c78aa4c6f1a1de4d34aebe05cd2ed1e7dcfd SHA1 (patch-data_Makefile.in) = 0c54664b1a59714c6bec02547d70eaa7dee47928 SHA1 (patch-data_mono-nunit.pc.in) = 59e0a932727b842ac90c2d0b702481d62f72cab8 @@ -48,7 +48,7 @@ SHA1 (patch-mono_metadata_mono-route.c) = 6eb741efca0a66fae894f7c49fa8f6393079e6 SHA1 (patch-mono_mini_mini-arm.c) = 1c4f85a6b2a49604a6b4299f65f0c93d0c01ffa3 SHA1 (patch-mono_profiler_proflog.c) = 060e8052aeedc1ee224d33644f39b8085a6c92a2 SHA1 (patch-mono_unit-tests_Makefile.in) = 98cb082e2e0ad53c36b513a7bce9568c26e14f21 -SHA1 (patch-mono_utils_Makefile.in) = de43f3fed64a1b52c18a63e66bf9fe8df6de40a6 +SHA1 (patch-mono_utils_Makefile.in) = be9caeff6d687e8c686d7436db2f39f7803c231a SHA1 (patch-mono_utils_mono-compiler.h) = 210062c167c00500f6a9176ef94c8cd96d39c730 SHA1 (patch-mono_utils_mono-mmap.c) = 869c24a57861fcfb1bdc8a04ed0e0d1fd5a0e0b5 SHA1 (patch-mono_utils_mono-semaphore.c) = a47c7816445c7781e1cf0efc889dedfbf5b351f9 diff --git a/lang/mono/patches/patch-configure b/lang/mono/patches/patch-configure index 42dbfde7f62..2c5991a8e9e 100644 --- a/lang/mono/patches/patch-configure +++ b/lang/mono/patches/patch-configure @@ -1,8 +1,8 @@ -$NetBSD: patch-configure,v 1.1 2015/05/21 14:38:08 kefren Exp $ +$NetBSD: patch-configure,v 1.2 2015/05/26 12:19:46 jperkin Exp $ ---- configure.orig 2015-05-06 00:29:57.000000000 +0300 -+++ configure 2015-05-11 15:38:17.000000000 +0300 -@@ -4024,7 +4024,7 @@ $as_echo "#define PLATFORM_NO_SYMLINKS 1 +--- configure.orig 2015-04-26 16:29:36.000000000 +0000 ++++ configure +@@ -4025,7 +4025,7 @@ $as_echo "#define PLATFORM_NO_SYMLINKS 1 mono_cv_clang=no if test "x$cross_compiling" = "xno"; then target_win32=yes @@ -11,7 +11,7 @@ $NetBSD: patch-configure,v 1.1 2015/05/21 14:38:08 kefren Exp $ $as_echo "#define TARGET_WIN32 1" >>confdefs.h -@@ -4061,10 +4061,13 @@ $as_echo "#define MINGW_CROSS_COMPILE 1" +@@ -4062,10 +4062,13 @@ $as_echo "#define MINGW_CROSS_COMPILE 1" CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD" libmono_ldflags="-pthread" need_link_unlink=yes @@ -26,7 +26,7 @@ $NetBSD: patch-configure,v 1.1 2015/05/21 14:38:08 kefren Exp $ ;; *-*-kfreebsd*-gnu) host_win32=no -@@ -4077,7 +4080,7 @@ $as_echo "#define MINGW_CROSS_COMPILE 1" +@@ -4078,7 +4081,7 @@ $as_echo "#define MINGW_CROSS_COMPILE 1" with_sigaltstack=no use_sigposix=yes ;; @@ -35,7 +35,7 @@ $NetBSD: patch-configure,v 1.1 2015/05/21 14:38:08 kefren Exp $ host_win32=no if test "x$PTHREAD_CFLAGS" = "x"; then CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS" -@@ -4093,7 +4096,8 @@ $as_echo "#define MINGW_CROSS_COMPILE 1" +@@ -4094,7 +4097,8 @@ $as_echo "#define MINGW_CROSS_COMPILE 1" LDFLAGS="$LDFLAGS $PTHREAD_LIBS -L/usr/local/lib" libmono_ldflags="$PTHREAD_LIBS" fi @@ -45,15 +45,17 @@ $NetBSD: patch-configure,v 1.1 2015/05/21 14:38:08 kefren Exp $ need_link_unlink=yes $as_echo "#define PTHREAD_POINTER_ID 1" >>confdefs.h -@@ -21984,6 +21988,7 @@ $as_echo_n "checking for Solaris XPG4 su +@@ -21983,9 +21987,7 @@ done + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Solaris XPG4 support" >&5 + $as_echo_n "checking for Solaris XPG4 support... " >&6; } if test -f /usr/lib/libxnet.so; then - CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=500" +- CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=500" CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__" -+ CPPFLAGS="$CPPFLAGS -D__C99FEATURES__" - CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED=1" +- CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED=1" LIBS="$LIBS -lxnet" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -@@ -25405,7 +25410,7 @@ $as_echo_n "checking LLVM version... " > + $as_echo "yes" >&6; } +@@ -25406,7 +25408,7 @@ $as_echo_n "checking LLVM version... " > { $as_echo "$as_me:${as_lineno-$LINENO}: result: $llvm_version" >&5 $as_echo "$llvm_version" >&6; } if echo $llvm_version | grep -q 'mono'; then @@ -62,7 +64,7 @@ $NetBSD: patch-configure,v 1.1 2015/05/21 14:38:08 kefren Exp $ if test "$llvm_version" != "$expected_llvm_version"; then as_fn_error $? "Expected llvm version $expected_llvm_version, but llvm-config --version returned $llvm_version\"" "$LINENO" 5 fi -@@ -25487,7 +25492,7 @@ LIBC="libc.so.6" +@@ -25488,7 +25490,7 @@ LIBC="libc.so.6" INTL="libc.so.6" SQLITE="libsqlite.so.0" SQLITE3="libsqlite3.so.0" @@ -71,7 +73,7 @@ $NetBSD: patch-configure,v 1.1 2015/05/21 14:38:08 kefren Exp $ GDKX11="libgdk-x11-2.0.so.0" GTKX11="libgtk-x11-2.0.so.0" XINERAMA="libXinerama.so.1" -@@ -25591,6 +25596,11 @@ $as_echo "#define __mono_ilp32__ 1" >>co +@@ -25592,6 +25594,11 @@ $as_echo "#define __mono_ilp32__ 1" >>co sizeof_register=8 fi case $host_os in @@ -83,7 +85,7 @@ $NetBSD: patch-configure,v 1.1 2015/05/21 14:38:08 kefren Exp $ linux*) sgen_supported=true AOT_SUPPORTED="yes" -@@ -25722,12 +25732,15 @@ fi +@@ -25723,12 +25730,15 @@ fi CPPFLAGS="$CPPFLAGS -D__ARM_EABI__" sgen_supported=true ;; @@ -102,7 +104,7 @@ $NetBSD: patch-configure,v 1.1 2015/05/21 14:38:08 kefren Exp $ CPPFLAGS="$CPPFLAGS -D__ARM_EABI__" ;; # TODO: make proper support for NaCl host. -@@ -25837,7 +25850,7 @@ $as_echo "#define TARGET_X86 1" >>confde +@@ -25838,7 +25848,7 @@ $as_echo "#define TARGET_X86 1" >>confde sizeof_register=4 ;; @@ -111,7 +113,7 @@ $NetBSD: patch-configure,v 1.1 2015/05/21 14:38:08 kefren Exp $ TARGET=ARM; arch_target=arm; -@@ -26181,15 +26194,17 @@ case "$host" in +@@ -26182,15 +26192,17 @@ case "$host" in GTKX11="libgtk-x11-2.0.dylib" ;; *-*-*netbsd*) @@ -132,7 +134,7 @@ $NetBSD: patch-configure,v 1.1 2015/05/21 14:38:08 kefren Exp $ LIBC="libc.so" INTL="libintl.so" SQLITE="libsqlite.so" -@@ -27176,7 +27191,6 @@ else +@@ -27177,7 +27189,6 @@ else fi diff --git a/lang/mono/patches/patch-mono_utils_Makefile.in b/lang/mono/patches/patch-mono_utils_Makefile.in index 9119543286f..ab75c1f8314 100644 --- a/lang/mono/patches/patch-mono_utils_Makefile.in +++ b/lang/mono/patches/patch-mono_utils_Makefile.in @@ -1,14 +1,14 @@ -$NetBSD: patch-mono_utils_Makefile.in,v 1.2 2015/05/21 14:38:08 kefren Exp $ +$NetBSD: patch-mono_utils_Makefile.in,v 1.3 2015/05/26 12:19:46 jperkin Exp $ -Add NetBSD threads +Add NetBSD and Solaris threads ---- mono/utils/Makefile.in.orig 2015-05-06 00:29:56.000000000 +0300 -+++ mono/utils/Makefile.in 2015-05-11 16:26:53.000000000 +0300 +--- mono/utils/Makefile.in.orig 2015-04-26 16:29:35.000000000 +0000 ++++ mono/utils/Makefile.in @@ -146,6 +146,7 @@ am__libmonoutils_la_SOURCES_DIST = mono- mono-threads-mach.c mono-threads-mach-helper.c \ mono-threads-windows.c mono-threads-linux.c \ mono-threads-freebsd.c mono-threads-openbsd.c \ -+ mono-threads-netbsd.c mono-threads-dragonfly.c \ ++ mono-threads-netbsd.c mono-threads-dragonfly.c mono-threads-solaris.c \ mono-threads-android.c mono-threads.h mono-tls.h mono-tls.c \ linux_magic.h mono-memory-model.h atomic.h atomic.c \ mono-hwcap.h mono-hwcap.c bsearch.h bsearch.c \ @@ -17,23 +17,25 @@ Add NetBSD threads mono-threads-mach.lo mono-threads-mach-helper.lo \ mono-threads-windows.lo mono-threads-linux.lo \ - mono-threads-freebsd.lo mono-threads-openbsd.lo \ -+ mono-threads-freebsd.lo mono-threads-openbsd.lo mono-threads-netbsd.lo \ ++ mono-threads-freebsd.lo mono-threads-openbsd.lo mono-threads-netbsd.lo mono-threads-solaris.lo \ mono-threads-android.lo mono-tls.lo atomic.lo mono-hwcap.lo \ bsearch.lo mono-conc-hashtable.lo sha1.lo json.lo \ networking.lo networking-posix.lo networking-fallback.lo \ -@@ -600,6 +601,8 @@ monoutils_sources = \ +@@ -600,6 +601,9 @@ monoutils_sources = \ mono-threads-linux.c \ mono-threads-freebsd.c \ mono-threads-openbsd.c \ ++ mono-threads-solaris.c \ + mono-threads-netbsd.c \ + mono-threads-dragonfly.c \ mono-threads-android.c \ mono-threads.h \ mono-tls.h \ -@@ -753,6 +756,8 @@ distclean-compile: +@@ -753,6 +757,9 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mono-threads-mach-helper.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mono-threads-mach.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mono-threads-openbsd.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mono-threads-solaris.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mono-threads-netbsd.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mono-threads-dragonfly.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mono-threads-posix.Plo@am__quote@ |