From owner-svn-ports-all@FreeBSD.ORG Thu Oct 16 00:46:13 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5525E81F; Thu, 16 Oct 2014 00:46:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 40959AF8; Thu, 16 Oct 2014 00:46:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9G0kD2A068256; Thu, 16 Oct 2014 00:46:13 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9G0kCMj068253; Thu, 16 Oct 2014 00:46:12 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201410160046.s9G0kCMj068253@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Thu, 16 Oct 2014 00:46:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r370966 - in head/devel/matreshka: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Oct 2014 00:46:13 -0000 Author: marino Date: Thu Oct 16 00:46:11 2014 New Revision: 370966 URL: https://svnweb.freebsd.org/changeset/ports/370966 QAT: https://qat.redports.org/buildarchive/r370966/ Log: devel/matreshka: Fix build on i386 platforms The author of matreshka informed me that GPRBuild 2014 has a bug in it that suppresses flags like -msse2 and -march. It's been fixed in the Pro version, but not the GPL version. He worked around the bug instead, and this commit brings in the essential part of that workaround. The GPRBuild bug prevented Matreshka from building on i386 on all releases and all platforms. While here, remove @dirrm from pkg-plist, strip the installed libraries, convert to USES=pgsql and tighten the makefile up a bit. MFH: 2014Q4 Added: head/devel/matreshka/files/patch-Makefile.build (contents, props changed) head/devel/matreshka/files/patch-Makefile.config.in (contents, props changed) Modified: head/devel/matreshka/Makefile Modified: head/devel/matreshka/Makefile ============================================================================== --- head/devel/matreshka/Makefile Thu Oct 16 00:16:37 2014 (r370965) +++ head/devel/matreshka/Makefile Thu Oct 16 00:46:11 2014 (r370966) @@ -3,7 +3,7 @@ PORTNAME= matreshka PORTVERSION= 0.6.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel MASTER_SITES= http://forge.ada-ru.org/matreshka/downloads/ @@ -30,6 +30,11 @@ MYSQL_CONFIGURE_ENABLE= mysql ORACLE_CONFIGURE_ENABLE= oracle AMF_CONFIGURE_ENABLE= amf +MYSQL_USE= MYSQL=yes +PGSQL_USES= pgsql +SQLITE3_USE= SQLITE=yes +FIREBIRD_USE= FIREBIRD=yes + MAKE_JOBS_UNSAFE= yes MAKE_ENV+= SMP_MFLAGS=-j${MAKE_JOBS_NUMBER} @@ -38,29 +43,15 @@ MAKE_ENV+= SMP_MFLAGS=-j${MAKE_JOBS_NUMB .if ${PORT_OPTIONS:MFIREBIRD} CONFIGURE_ARGS+= --with-firebird-libdir=${LOCALBASE}/lib -USE_FIREBIRD= yes -.endif - -.if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes -.endif - -.if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes -.endif - -.if ${PORT_OPTIONS:MSQLITE3} -USE_SQLITE= yes .endif pre-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${MAKE_CMD} config post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so \ + ${STAGEDIR}${PREFIX}/bin/wsdl2ada @cd ${STAGEDIR}${PREFIX}; ${FIND} * \( -type f -or -type l \) | \ ${SORT} >> ${TMPPLIST} - @cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d | ${AWK} '/\//' | ${SORT} -r | \ - ${SED} -e '/lib\/gnat$$/d' -e 's/^/@dirrm /g' >> ${TMPPLIST} - @echo "@unexec rmdir %D/lib/gnat 2>/dev/null || true" >> ${TMPPLIST} .include Added: head/devel/matreshka/files/patch-Makefile.build ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/matreshka/files/patch-Makefile.build Thu Oct 16 00:46:11 2014 (r370966) @@ -0,0 +1,29 @@ +--- Makefile.build.orig 2013-09-18 07:12:40.852703000 +0000 ++++ Makefile.build +@@ -1,5 +1,6 @@ + include Makefile.config + ++GNATMAKE = gnatmake + GPRBUILD_FLAGS = -p $(SMP_MFLAGS) + + ALL_TARGETS = league xml fastcgi soap wsse wsdl2ada sql +@@ -31,6 +32,19 @@ endif + all: $(ALL_TARGETS) + + league: ++ifneq (, $(findstring x86,$(ARCHITECTURE))) ++ $(GNATMAKE) -p -c -u -Pgnat/matreshka_league.gpr matreshka-internals-strings-handlers-x86_utilities.adb ++ifeq ($(ARCHITECTURE), x86) ++ $(GNATMAKE) -p -c -u -Pgnat/matreshka_league.gpr matreshka-simd-intel-sse.adb ++ $(GNATMAKE) -p -c -u -Pgnat/matreshka_league.gpr matreshka-simd-intel-sse2.ads ++ $(GNATMAKE) -p -c -u -Pgnat/matreshka_league.gpr matreshka-internals-strings-handlers-generic_x86_sse2.adb ++ $(GNATMAKE) -p -c -u -Pgnat/matreshka_league.gpr matreshka-internals-strings-handlers-x86-sse2.ads ++ $(GNATMAKE) -p -c -u -Pgnat/matreshka_league.gpr matreshka-internals-strings-handlers-x86-sse2_popcnt.ads ++endif ++ifeq ($(ARCHITECTURE), x86_64) ++ $(GNATMAKE) -p -c -u -Pgnat/matreshka_league.gpr matreshka-internals-strings-handlers-x86_64_popcnt.ads ++endif ++endif + $(GPRBUILD) $(GPRBUILD_FLAGS) -Pgnat/matreshka_league.gpr + + xml: league Added: head/devel/matreshka/files/patch-Makefile.config.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/matreshka/files/patch-Makefile.config.in Thu Oct 16 00:46:11 2014 (r370966) @@ -0,0 +1,10 @@ +--- Makefile.config.in.orig 2013-12-22 22:34:01.201864000 +0000 ++++ Makefile.config.in +@@ -1,6 +1,7 @@ + + VERSION = @VERSION@ + RTL_VERSION = @RTL_VERSION_SUFFIX@ ++ARCHITECTURE = @ARCHITECTURE@ + OPERATING_SYSTEM = @OPERATING_SYSTEM@ + + PREFIX = @PREFIX@