From owner-freebsd-ports@FreeBSD.ORG Tue Aug 12 12:29:08 2003 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 349D937B401 for ; Tue, 12 Aug 2003 12:29:08 -0700 (PDT) Received: from freebsd.org.ru (www.freebsd.org.ru [194.84.67.5]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4F89343F85 for ; Tue, 12 Aug 2003 12:29:07 -0700 (PDT) (envelope-from osa@freebsd.org.ru) Received: by freebsd.org.ru (Postfix, from userid 1000) id 641A44AA; Tue, 12 Aug 2003 23:29:05 +0400 (MSD) Date: Tue, 12 Aug 2003 23:29:05 +0400 From: "Sergey A. Osokin" To: ports@FreeBSD.org Message-ID: <20030812192905.GJ9150@freebsd.org.ru> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="1giRMj6yz/+FOIRq" Content-Disposition: inline User-Agent: Mutt/1.5.4i Subject: [PATCH] lang/cli: unbreak build on -CURRENT X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Aug 2003 19:29:08 -0000 --1giRMj6yz/+FOIRq Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hello. I make a patch for fix compile lang/cli under -CURRENT (patch attached), but still have another one unresolved issue. >From work/sscli/clr/src/buildr.log: if [ -f securitydb.raw ]; then clix /usr/ports/lang/cli/work/sscli/build/v1.x86fre.rotor/dump/secdbedit.exe -regen securitydb xml; fi {0804D000} ASSERT [SHMEM ] at ../shmemory.c.1376: Segment 114 still unknown; returning NULL Trace/BPT trap (core dumped) NMAKE : fatal error U1077: 'if' : return code '0x85' Stop. BUILD: nmake failed - rc = 2 Any idea? -- Rgdz, /"\ ASCII RIBBON CAMPAIGN Sergey Osokin aka oZZ, \ / AGAINST HTML MAIL http://ozz.pp.ru/ X AND NEWS / \ --1giRMj6yz/+FOIRq Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=patch-cli Index: ports/lang/cli/Makefile =================================================================== RCS file: /home/pcvs/ports/lang/cli/Makefile,v retrieving revision 1.16 diff -u -r1.16 Makefile --- ports/lang/cli/Makefile 8 Aug 2003 04:40:42 -0000 1.16 +++ ports/lang/cli/Makefile 12 Aug 2003 19:14:52 -0000 @@ -20,7 +20,7 @@ RESTRICTED= "license terms need to be reviewed" ONLY_FOR_ARCHS= i386 -BROKEN= "Does not compile" +#BROKEN= "Does not compile" USE_REINPLACE= yes GNU_CONFIGURE= yes @@ -29,7 +29,6 @@ MAKEFILE= makefile MAKE_ENV= CC_NAME="${CC}" SHELL="${SH}" BUILD_TYPE= free -CFLAGS+= -fpermissive PLIST_SUB= CLI_VERSION="${PORTVERSION}" .include @@ -37,6 +36,7 @@ .if ${OSVERSION} >= 500000 GCC_LIB= -lstdc++ -lgcc -lc_r -lc .else +CFLAGS+= -fpermissive GCC_LIB= -lstdc++ -lgcc -lc_r .endif @@ -44,9 +44,16 @@ @${CP} ${SCRIPTDIR}/portconfigure ${WRKSRC} post-patch: - @${REINPLACE_CMD} -e 's|%%GCC_LIB%%|${GCC_LIB}|g' \ + @${REINPLACE_CMD} -e 's|%%GCC_LIB%%|${GCC_LIB}|g; \ + s|-fno-rtti ||g; \ + s|-fcheck-new ||g;' \ ${WRKSRC}/makefile.common.in \ ${WRKSRC}/rotorenv/bin/rotor_x86mk.inc + @${FIND} ${WRKSRC}/rotorenv/bin -type f | ${XARGS} \ + ${REINPLACE_CMD} -e 's|-Wno-non-virtual-dtor||g; \ + s|-Wno-non-template-friend||g;' + @${FIND} ${WRKSRC}/clr/src -type f | ${XARGS} \ + ${REINPLACE_CMD} -e 's|-Wno-ctor-dtor-privacy||g' do-build: @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ./buildall ${BUILD_TYPE}) --- /dev/null Tue Aug 12 23:14:10 2003 +++ ports/lang/cli/files/patch-palrt::src::numprs.cpp Tue Aug 12 19:06:43 2003 @@ -0,0 +1,11 @@ +--- palrt/src/numprs.cpp.orig Tue Aug 12 18:49:14 2003 ++++ palrt/src/numprs.cpp Tue Aug 12 18:49:28 2003 +@@ -41,7 +41,7 @@ + // + #define MAXEXP (INT_MAX/2) + +-const SPLIT64 sdlTenToEighteen = { {UI64(1000000000000000000)} }; ++const SPLIT64 sdlTenToEighteen = { UI64(1000000000000000000) }; + // Max value of Decimal (= 79228162514264337593543950335), less 1st digit. + const BYTE rgbMaxDec[DEC_MAXDIG - 1] = {9,2,2,8,1,6,2,5,1,4,2,6,4,3,3,7,5,9,3,5,4,3,9,5,0,3,3,5}; + --1giRMj6yz/+FOIRq--