From nobody Fri Nov 24 06:18:00 2023 X-Original-To: dev-commits-ports-branches@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 4Sc4Xm4NNNz51PFc; Fri, 24 Nov 2023 06:18:00 +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 4Sc4Xm3xnNz4S78; Fri, 24 Nov 2023 06:18:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700806680; 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=tXM53othaCH+FpawNoSPUcZ3F/mRlXY3pmFGtTP+Hck=; b=YFdfWVdoU8Q1miM6kwDkVkQNHtVOA/q0+ajK/F2ylWKQPwAJBoyltl9v0uGt6Oanyvd86+ oS6ZONgG04YxyiU0HeTlU8zZbBVnxrN1nMilMYkNOXp7vh2Qxz3jgmBKCbo+FuxedxUmpA 96Mvz5VimBLjOZdaE/zh2YItghaXqf4hiSaHq5kqeX+lKr/8M2sO8tySnYsxQe1leyH/Ij B2ypQqGPoqB0xNG5esilL0G+8P0oDWMRKuARHXXUaEaCSQZ8hkhs4j1oDd9CUQQxzZe9VB 5wu/2uUqMQH1oEB/G59NZc+a63F2j+0eWq74u8dgwKVjuhNS5TJPKmpSzAlZ1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700806680; 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=tXM53othaCH+FpawNoSPUcZ3F/mRlXY3pmFGtTP+Hck=; b=hRKeANL/T2ex768APdOFRAh9FCcgpX1xDrjJQnh3dD18/xjGEaFDWdYi8n1y7RYV+rO4+U QtRuYhDc42F3M+DmwITK2A2zMvoaC1OUhMDZu9g3+HkLJ5lFWEdZ9PIP4NEu6PVO02NoBj GpjcnHPVk+k61QmTn6ugLCtPFZmLTijTTGO1gdi+RA5O6U2j3QvzTM0Rad5OmyQ/HJe+XM osXwovhKSVl1PHL3c9/34Ai5ZnxfcEi7ZmH4B7WOf2LJJIrQcrdkX9S+9cUzk8SvblCKgw OZbboFAn5B47EiQs3a7+9NDGj5wczLtcXJJx0P13gCthF497QWv/U6k4HkblMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700806680; a=rsa-sha256; cv=none; b=gul2nT3mKJZuoD+bgF7yveA9shwfBJedjn8QMrI1ifop2Fo2u5zuV/6HqeyTGGyCrldBuD XTOk9JQuhHNsN7V+wvQAzPGaB33KCGXAcMLih3HAR0is8DvS5OAx2I6On1c3T//pT8k+// E/lypwDHgDJujrM5CswosIfxR4YbaxLdNAl/jzTc5np/m3GywCcDSLm+iZE0/jmAzh0vJL UUi1D7PcxnQAVA2K//yeuaDZ3DwP8PHI6fmrNNjpcBZRG7rYaKd7TGdNntEl8ZM0UKGQcR DhHepxFZeJ+mOm1PEikBLht4H3O9goL1eDC/2YFAEMlkdvgYGcvWQPVWJrMFrQ== 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 4Sc4Xm30lszZPZ; Fri, 24 Nov 2023 06:18:00 +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 3AO6I0Eh029615; Fri, 24 Nov 2023 06:18:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AO6I01c029612; Fri, 24 Nov 2023 06:18:00 GMT (envelope-from git) Date: Fri, 24 Nov 2023 06:18:00 GMT Message-Id: <202311240618.3AO6I01c029612@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: 690ea2e84f43 - 2023Q4 - dns/void-zones-tools: Fix build with WITH_PIE=YES List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q4 X-Git-Reftype: branch X-Git-Commit: 690ea2e84f43fa7f8c055557c6f00238c7e4c2a8 Auto-Submitted: auto-generated The branch 2023Q4 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=690ea2e84f43fa7f8c055557c6f00238c7e4c2a8 commit 690ea2e84f43fa7f8c055557c6f00238c7e4c2a8 Author: Vidar Karlsen AuthorDate: 2023-11-13 21:21:58 +0000 Commit: Robert Clausecker CommitDate: 2023-11-24 06:16:16 +0000 dns/void-zones-tools: Fix build with WITH_PIE=YES Patch CFLAGS from being overridden and remove -fno-pic to facilitate building with WITH_PIE=yes PR: 275039 Reported by: Marek Zarychta (cherry picked from commit 11a7b638a6c63425070e60ddcad9ebb27fad88c9) --- dns/void-zones-tools/Makefile | 1 + dns/void-zones-tools/files/patch-Makefile | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dns/void-zones-tools/Makefile b/dns/void-zones-tools/Makefile index aa43a50a11b3..eec68d79df7e 100644 --- a/dns/void-zones-tools/Makefile +++ b/dns/void-zones-tools/Makefile @@ -2,6 +2,7 @@ PORTNAME= void-zones-tools DISTVERSIONPREFIX= v DISTVERSION= 1.0.2-18 DISTVERSIONSUFFIX= -g204634a +PORTREVISION= 1 CATEGORIES= dns MAINTAINER= vidar@karlsen.tech diff --git a/dns/void-zones-tools/files/patch-Makefile b/dns/void-zones-tools/files/patch-Makefile index eff508c7c245..7d0d77e5c7ca 100644 --- a/dns/void-zones-tools/files/patch-Makefile +++ b/dns/void-zones-tools/files/patch-Makefile @@ -1,13 +1,22 @@ --- Makefile.orig 2023-08-28 22:28:23 UTC +++ Makefile -@@ -26,9 +26,7 @@ +@@ -26,15 +26,13 @@ CC ?= clang DV != $(CC) -dumpversion -.if $(MACHINE) == "i386" || $(MACHINE) == "amd64" || $(MACHINE) == "x86_64" -CFLAGS = $(CDEFS) -march=native -mssse3 -.elif $(MACHINE) == "arm" +-CFLAGS = $(CDEFS) -fsigned-char +.if $(MACHINE) == "arm" - CFLAGS = $(CDEFS) -fsigned-char ++CFLAGS += $(CDEFS) -fsigned-char .else - CFLAGS = $(CDEFS) +-CFLAGS = $(CDEFS) ++CFLAGS += $(CDEFS) + .endif + +-CFLAGS += -std=gnu11 -g0 -O3 -fno-pic -fvisibility=hidden -fstrict-aliasing -fno-common -fstack-protector -Wno-parentheses ++CFLAGS += -std=gnu11 -g0 -O3 -fvisibility=hidden -fstrict-aliasing -fno-common -fstack-protector -Wno-parentheses + + # Clang only flags come here + .if $(DV) == "4.2.1"