From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0130DC04EB5 for ; Fri, 7 Feb 2020 14:42:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C84E920720 for ; Fri, 7 Feb 2020 14:42:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (3072-bit key) header.d=samba.org header.i=@samba.org header.b="rmD63y/e" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726899AbgBGOm2 (ORCPT ); Fri, 7 Feb 2020 09:42:28 -0500 Received: from hr2.samba.org ([144.76.82.148]:52502 "EHLO hr2.samba.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726867AbgBGOm2 (ORCPT ); Fri, 7 Feb 2020 09:42:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=samba.org; s=42; h=Message-Id:Date:Cc:To:From; bh=0ixIAJTc9gjYCvw1oFfeaWPlR72Yo+4oVxP8Emf9Xr8=; b=rmD63y/ezQ8e0BRcCgK4GcLTb/ c7+48hd5rXhng3BF3MEnnIhUu37MnnbP++t2uch4yvdtQitarpGwqxJwuFGZehBVn6XzMotFR4tSM 0ctOfLWHIrIdVuJVow+eIGRyM9N5dZfq+fi1BOA3MS3D+NRPSyp2Zgt2gnprIbAOXYE2AABMvN3o3 UUhkia9Ph23YFProFOaNSVO0nKN1sQTh9P4Q6+J4f7kAssQkza8ppLY9bHK9rMcJ5nWWwsZ+NEueZ 0JsXgPsJ3VoJ6xTtvxJq1iFKvKs7eWgVswy1YjTYMYg0/uw+1+CABkUCsUcHR+upegFd/gKNUAuZo inwLRrwezNF1ufYj3gCVyCyscZoal2OVGlByV/rpzNPc49mVIcG369LUO2kGb0tVEZdVKMVFlBtGs Dms6i6kI08pgBvoObHs9IUS7zR0ens3Iom7uJhrQPkZ2hC+44T4yAnwEW9w/ekmIxpulGyHASR1p+ y/uVhPXONPenE011TF/BXUGS; Received: from [127.0.0.2] (localhost [127.0.0.1]) by hr2.samba.org with esmtpsa (TLS1.3:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim) id 1j04pt-0001QA-MW; Fri, 07 Feb 2020 14:42:25 +0000 From: Stefan Metzmacher To: io-uring@vger.kernel.org Cc: Stefan Metzmacher Subject: [PATCH v2] Fix liburing.so symlink source if libdir != libdevdir Date: Fri, 7 Feb 2020 15:42:12 +0100 Message-Id: <20200207144212.4212-1-metze@samba.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <35cb2c1e-5985-13a8-1719-1bfa9aeb65a4@samba.org> References: <35cb2c1e-5985-13a8-1719-1bfa9aeb65a4@samba.org> Sender: io-uring-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org Signed-off-by: Stefan Metzmacher --- Makefile | 6 +++++- configure | 8 +++++++- debian/changelog | 6 ++++++ src/Makefile | 2 +- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3b582f1..05d5879 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,11 @@ endif $< >$@ install: $(NAME).pc - @$(MAKE) -C src install prefix=$(DESTDIR)$(prefix) includedir=$(DESTDIR)$(includedir) libdir=$(DESTDIR)$(libdir) libdevdir=$(DESTDIR)$(libdevdir) + @$(MAKE) -C src install prefix=$(DESTDIR)$(prefix) \ + includedir=$(DESTDIR)$(includedir) \ + libdir=$(DESTDIR)$(libdir) \ + libdevdir=$(DESTDIR)$(libdevdir) \ + relativelibdir=$(relativelibdir) $(INSTALL) -D -m 644 $(NAME).pc $(DESTDIR)$(libdevdir)/pkgconfig/$(NAME).pc $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man2 $(INSTALL) -m 644 man/*.2 $(DESTDIR)$(mandir)/man2 diff --git a/configure b/configure index 9fb43b3..2fa393f 100755 --- a/configure +++ b/configure @@ -48,7 +48,7 @@ if test -z "$libdir"; then libdir="$prefix/lib" fi if test -z "$libdevdir"; then - libdevdir="$libdir" + libdevdir="$prefix/lib" fi if test -z "$mandir"; then mandir="$prefix/man" @@ -57,6 +57,11 @@ if test -z "$datadir"; then datadir="$prefix/share" fi +if test x"$libdir" = x"$libdevdir"; then + relativelibdir="" +else + relativelibdir="$libdir/" +fi if test "$show_help" = "yes"; then cat < Fri, 07 Feb 2020 15:30:00 +0100 + liburing (0.4-1) stable; urgency=low * Package liburing-0.4 using a packaging layout similar to libaio1 diff --git a/src/Makefile b/src/Makefile index 1466dd4..5d13c09 100644 --- a/src/Makefile +++ b/src/Makefile @@ -61,7 +61,7 @@ install: $(all_targets) ifeq ($(ENABLE_SHARED),1) install -D -m 755 $(libname) $(libdir)/$(libname) ln -sf $(libname) $(libdir)/$(soname) - ln -sf $(libname) $(libdevdir)/liburing.so + ln -sf $(relativelibdir)$(libname) $(libdevdir)/liburing.so endif $(liburing_objs): include/liburing.h -- 2.17.1