From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F1916147C69 for ; Wed, 1 May 2024 18:07:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714586824; cv=none; b=hJY7U1yy3QeLi/pJrI49MIsa5Owl9YTKnTvK1RRcN/nxusZpeINDW6R4A+CivksPeftp2glrcVvr6BbHsisRuW9mk2iF075/WWMCtlXya1PmYxW8su7MhzdPm3sVGNx6zyNjg1mVy2qBigIoqPwYB7TeiRChiY5dWHQV3LjsmDg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714586824; c=relaxed/simple; bh=ZUMug3+C9O3HEcQpMVlNDkbdiTJ/SEtHzQt/mN0AK1E=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=DKdzcoSUU+obyGoAhrHyuMFT0iKPU08kv6LoWXi3pSVH1/QBJwBtrz4Mk4pGYlMe+DAt6L89HxLdfPwpduYV0TLuvlWbYG3CIw473REUdvV+D3SMj5tYH0dIrMkd634gIVECntiy8zV2l9rjjQMPfuq7TVQjLosi53FyHc3Ust8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=i9WSodro; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="i9WSodro" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714586821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Xo6zDFsioQYPIlhEHSEQIYSKH6kSiuzTjK4zDtEjJEU=; b=i9WSodroHthXT9w9AviPYKjE6V1NlFm/u68PHAah5noNqSFuJ0UOS7rgVd3w9g/b2124KN k2gotEi5zexJJsTRfQKTcUaUWDg0lqTSFzGct208Vhm5qwJLVuA/ejF/RDq9zx8N56Q0ux PcdV5QZNQBHfL/1y2l2A2jrMFBAOEII= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-382-gKdwvFcxOUq2_4brlOKhvA-1; Wed, 01 May 2024 14:06:58 -0400 X-MC-Unique: gKdwvFcxOUq2_4brlOKhvA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 51CD68948A4; Wed, 1 May 2024 18:06:58 +0000 (UTC) Received: from redhat.com (unknown [10.22.34.15]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F072CEC682; Wed, 1 May 2024 18:06:57 +0000 (UTC) Date: Wed, 1 May 2024 13:06:56 -0500 From: Bill O'Donnell To: Bill O'Donnell Cc: "Darrick J. Wong" , cem@kernel.org, Christoph Hellwig , linux-xfs@vger.kernel.org Subject: Re: [PATCH 1/2] debian: fix package configuration after removing platform_defs.h.in Message-ID: References: <171338841078.1852814.8154538108927404452.stgit@frogsfrogsfrogs> <171338841094.1852814.10756994414036094487.stgit@frogsfrogsfrogs> Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5 On Wed, May 01, 2024 at 01:00:30PM -0500, Bill O'Donnell wrote: > On Wed, Apr 17, 2024 at 02:18:22PM -0700, Darrick J. Wong wrote: > > From: Darrick J. Wong > > > > In commit 0fa9dcb61b4f, we made platform_defs.h a static header file > > instead of generating it from platform_defs.h.in. Unfortunately, it > > turns out that the debian packaging rules use "make > > include/platform_defs.h" to run configure with the build options > > set via LOCAL_CONFIGURE_OPTIONS. > > > > Since platform_defs.h is no longer generated, the make command in > > debian/rules does nothing, which means that the binaries don't get built > > the way the packaging scripts specify. This breaks multiarch for > > libhandle.so, as well as libeditline and libblkid support for > > xfs_db/io/spaceman. > > > > Fix this by correcting debian/rules to make include/builddefs, which > > will start ./configure with the desired options. > > > > Fixes: 0fa9dcb61b4f ("include: stop generating platform_defs.h") > > Signed-off-by: Darrick J. Wong > > Reviewed-by: Christoph Hellwig > > Reviewed-by: Bill O'Donnell derp. Just noticed it's already merged. ;) > > > --- > > debian/rules | 6 ++++-- > > 1 file changed, 4 insertions(+), 2 deletions(-) > > > > > > diff --git a/debian/rules b/debian/rules > > index 7e4b83e2b..0c1cef92d 100755 > > --- a/debian/rules > > +++ b/debian/rules > > @@ -61,15 +61,17 @@ config: .gitcensus > > $(checkdir) > > AUTOHEADER=/bin/true dh_autoreconf > > dh_update_autotools_config > > - $(options) $(MAKE) $(PMAKEFLAGS) include/platform_defs.h > > + # runs configure with $(options) > > + $(options) $(MAKE) $(PMAKEFLAGS) include/builddefs > > cp -f include/install-sh . > > touch .gitcensus > > > > dibuild: > > $(checkdir) > > @echo "== dpkg-buildpackage: installer" 1>&2 > > + # runs configure with $(options) > > if [ ! -f mkfs/mkfs.xfs-$(bootpkg) ]; then \ > > - $(diopts) $(MAKE) include/platform_defs.h; \ > > + $(diopts) $(MAKE) include/builddefs; \ > > mkdir -p include/xfs; \ > > for dir in include libxfs; do \ > > $(MAKE) $(PMAKEFLAGS) -C $$dir NODEP=1 install-headers; \ > > > > > >