From nobody Thu Aug 31 02:08:56 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rbl2d1BHMz4rXNM; Thu, 31 Aug 2023 02:08:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rbl2d0Jrgz3LX1; Thu, 31 Aug 2023 02:08:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693447737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ylN+yBGMP7jHJVE0gDLri7A0FFEd10Y/aJvnqyLZEEs=; b=OsrPCX7d1rRvKSoy7yBiRPj1RTws0S/tsMhzCtApRqdLrWsZRv6p1TAM8c+lX5xMXWAO24 7X0eVG5hk3pmfYtFi4YNr/2x9rV3P8gzzwvVYjORwiI3ww7Q7nMskvX2yYBQpSLXao7Apg INYtwzaBJpbQt7XI2jxmEgJtWxtKOjul7Hy8HtGCAXXy78SW0AsAH3SL5bT+0tkh5Lersh kGab0a8BsM1o+VpO1ekh+TqnyZ6U4C8Yo13LobChPBC3qQ5DUVmiChVUsavSa9UWraWjhk w+C+rInYkAMLYQsI6REvoXMoAlM4Gk1xnSS5NMHX0ADP9OsWFo0DyhDK7jBpBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693447737; a=rsa-sha256; cv=none; b=rQrjE4ZqSqSbhX+SZkNw9GrjrUwQHUc5J6iudPIMTp7uHCfMD32CuPSt2KWL8rf/iPFHoi WHYQTvR1F4gLzl5wUO+u1x+RklEuQRimrbLmhxHTEzxZUef0CygmcdPrxyrWwaPBn3mFiP jbeTfMk93KzN81Dwxx7iAZyLxi+HS/FNPzDyXL6rh31cDjUVNcf9tsSJaJm2xL6YNTWm/4 Ylm1VwYHk5ThEJBAb4odc1nXDaItU8yCTFy23O6jJx14SpBfK6/2VkDFU9kXZNoySdxUcI pJWIdbPhphwk9c5KRCrrv2G9+ZpHum4D+LJM8E28TiaXfTRjT+96r530MBxsTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693447737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ylN+yBGMP7jHJVE0gDLri7A0FFEd10Y/aJvnqyLZEEs=; b=fgZfk+8L+zJ/nZIJU/Jv1pGDVlD3xRsB7Lge1OOHAFKf6opAuj4Bgq8AAkbdcklXZC9Wiw eBwlI1UA1mEBUcNk3wU+R9P9ckFLTGrL+rZlWYNJiCeHbvEloKUedB6m7sT4CYXUjU7k7Z VBUZ7HZESmg/vAsmgBja8wnRpM+eK2zSZDFhMqMNExALs5RLgWmKbPhVH8rqC8MlMZ3THf cS2Ehwvi6WoT7Uc/sgcWWAtV3ijpLajYrwPBEG8uD033aJLbOm76Rh67Bxd7135OmHuMop lLNCZDcpCweckuYafltfY2sgjdUp08BbLVhA2jsVFtYJ0/9IlQw5dmr907BWdg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rbl2c6TJKzxsj; Thu, 31 Aug 2023 02:08:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37V28uES002970; Thu, 31 Aug 2023 02:08:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37V28uPS002968; Thu, 31 Aug 2023 02:08:56 GMT (envelope-from git) Date: Thu, 31 Aug 2023 02:08:56 GMT Message-Id: <202308310208.37V28uPS002968@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 9263318fd2cc - main - math/blahtexml: revert/redo previous bogus build "fix" against Clang 16 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9263318fd2cce6e185f721d0e1f50c2818ada19f Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=9263318fd2cce6e185f721d0e1f50c2818ada19f commit 9263318fd2cce6e185f721d0e1f50c2818ada19f Author: Alexey Dokuchaev AuthorDate: 2023-08-31 02:08:10 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-08-31 02:08:10 +0000 math/blahtexml: revert/redo previous bogus build "fix" against Clang 16 - Patch the makefile to respect CXXFLAGS so that USE_CXXSTD=c++11 works as intended and remove the whole `USES+=llvm:max=15' abomination - While here, convert to USES+=iconv, and drop MAKE_ARGS and LDFLAGS as we need to patch that line in the makefile anyway Fixes: f3eeadc739f9 --- math/blahtexml/Makefile | 20 +++----------------- math/blahtexml/files/patch-makefile | 15 ++++++++++++--- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/math/blahtexml/Makefile b/math/blahtexml/Makefile index 3619a4cf7b1a..49d63d8b5167 100644 --- a/math/blahtexml/Makefile +++ b/math/blahtexml/Makefile @@ -9,32 +9,18 @@ WWW= http://gva.noekeon.org/blahtexml/ LICENSE= BSD3CLAUSE -LIB_DEPENDS= libiconv.so:converters/libiconv \ - libxerces-c.so:textproc/xerces-c3 - -USES= gmake localbase:ldflags +LIB_DEPENDS= libxerces-c.so:textproc/xerces-c3 +USES= gmake iconv localbase +USE_CXXSTD= c++11 USE_GITHUB= yes GH_ACCOUNT= gvanas MAKEFILE= makefile -MAKE_ARGS= CFLAGS="${CFLAGS}" - ALL_TARGET= blahtexml-linux -LDFLAGS+= -liconv - PLIST_FILES= bin/${PORTNAME} -.include - -.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) -USES+= llvm:max=15 -CC= clang${LLVM_VERSION} -CPP= clang-cpp${LLVM_VERSION} -CXX= clang++${LLVM_VERSION} -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin diff --git a/math/blahtexml/files/patch-makefile b/math/blahtexml/files/patch-makefile index 870d18275743..5d1a851efca5 100644 --- a/math/blahtexml/files/patch-makefile +++ b/math/blahtexml/files/patch-makefile @@ -1,11 +1,20 @@ ---- makefile.orig 2021-09-23 07:29:40 UTC +--- makefile.orig 2023-03-27 19:53:27 UTC +++ makefile -@@ -120,7 +120,7 @@ blahtex-mac: $(BINDIR) $(OBJECTS) $(HEADERS) +@@ -111,7 +111,7 @@ $(BINDIR)/%.o:%.c + $(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@ + + $(BINDIR_XMLIN)/%.o:%.cpp +- $(CXX) $(INCLUDES) $(CFLAGS) -DBLAHTEXML_USING_XERCES -c $< -o $@ ++ $(CXX) $(INCLUDES) $(CXXFLAGS) -DBLAHTEXML_USING_XERCES -c $< -o $@ + + $(BINDIR_XMLIN)/%.o:%.c + $(CC) $(INCLUDES) $(CFLAGS) -DBLAHTEXML_USING_XERCES -c $< -o $@ +@@ -123,7 +123,7 @@ blahtex-mac: $(BINDIR) $(OBJECTS) $(HEADERS) $(CXX) $(CFLAGS) -o blahtex -liconv $(OBJECTS) blahtexml-linux: $(BINDIR_XMLIN) $(OBJECTS_XMLIN) $(HEADERS_XMLIN) - $(CXX) $(CFLAGS) -o blahtexml $(OBJECTS_XMLIN) -lxerces-c -+ $(CXX) $(CFLAGS) $(LDFLAGS) -o blahtexml $(OBJECTS_XMLIN) -lxerces-c ++ $(CXX) $(CXXFLAGS) -o blahtexml $(OBJECTS_XMLIN) $(LIBS) -lxerces-c blahtexml-mac: $(BINDIR_XMLIN) $(OBJECTS_XMLIN) $(HEADERS_XMLIN) $(CXX) $(CFLAGS) -o blahtexml -liconv $(OBJECTS_XMLIN) -lxerces-c