From nobody Tue Feb 18 01:33:33 2025 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 4Yxhqy3CBMz5nlSN; Tue, 18 Feb 2025 01:33:34 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yxhqx4dgpz3Tkp; Tue, 18 Feb 2025 01:33:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739842413; 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=Mikic78u5UUcu8DTMPpWCMgSv+nYzmhM479FUxgjJGs=; b=GNpmJLc4xKiT6KO1kOsu62TUQfROBuIlY58UPwQl0aHd1JOSFXMStU5ntehdV1beiaIQma RcmHwHFtH1tr84Xkc+OKQD+GfVZ+TMRtB3+Zp8BQc3d48zQGs6CiQcpLWNXMing3G8Ep2B Zj/bFmO6BHnWb+VITB1gcUGEZSE4ruEEAA2HD8ZW6drRSeRbFnFaQP+e9KVJ0E7XVsnFzJ Ld5JITiVzG6hBHQ5In7yCu5BZrHL74tGqu5pmLjf5BygVwxlDv2fGmiaJkenLwgyqPhtjb HYILFdda5T8tKk0PF5YkYk4maigWi9B0BBrBmfU6R6zXwNIxHVQhCRdtbU8fng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739842413; a=rsa-sha256; cv=none; b=xDkmamA7JgkUF5Kl/TwwECDE0kwc2v2mI7nW4bv2AKJ+w4NakzK7KR9iwHC4TV1xp12tO5 NZ3MLkq3unhkbaNu0Tt0LUJ7v2TUJuX8lclF8bNLh8SMtYq8l2nerS5EDEtiTv5W6gu1xC jtHhqE0CRO4QDA3piF4SEcAt9jzoLLRumrRQFD1Ya5bgRAtbkj9sHMMyTO6WC+sxVWD/mX ttfykbwDJkUe+wrGGu7ejF+Av+voB6VQQgjpecE7CIB2c04xGwXkjm0mHXrYDzP2CBQy9Q hcBrlzsWLgRai5Yih24s0pZfv6RkMQYoC5AlK3vGxliv/CmVLc9RjP8lJkZACg== 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=1739842413; 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=Mikic78u5UUcu8DTMPpWCMgSv+nYzmhM479FUxgjJGs=; b=L7kR4v6dl4HYD7InY2JfZYrl1gYNI1M+pw2bXJeSkDeuq0CBf+cuPSjBKrQfRKzlKs849l kURVqJXOq9dzgwVFrKZ6Ac5lPbbUo+AJkC6V2XOwzSwl2T6bURO7ETNuZmsvOMp9hgdr3J BhxTTZFfMKvnnaQMcV5HUxFboMacQHLfpnpYVj5s0qdoyv1Y0M/d6T37Qkd9pMtM3i4zA0 guJbGJHk/9DVWa8NBhLdtYnMaAsy50/XT/72/JbWIi0rrdVWF6l9vPDvRvnCaKla9ce+wZ ol08vVj6tK7ofsRZr6XDkVFw63mExNdV7LM60NpG3nsUV3/A2shMoBpJK3fK1A== 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 4Yxhqx4CKMzyJc; Tue, 18 Feb 2025 01:33:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51I1XXQ1099709; Tue, 18 Feb 2025 01:33:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51I1XXeH099706; Tue, 18 Feb 2025 01:33:33 GMT (envelope-from git) Date: Tue, 18 Feb 2025 01:33:33 GMT Message-Id: <202502180133.51I1XXeH099706@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 9bbea19b367b - main - net-im/concord: Add SONAME for libdiscord.so 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9bbea19b367b53aa09bd49dc8ec4cfb35ff7f989 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=9bbea19b367b53aa09bd49dc8ec4cfb35ff7f989 commit 9bbea19b367b53aa09bd49dc8ec4cfb35ff7f989 Author: Souji Thenria AuthorDate: 2025-02-18 01:24:36 +0000 Commit: Vladimir Druzenko CommitDate: 2025-02-18 01:24:36 +0000 net-im/concord: Add SONAME for libdiscord.so An error indicates that the SONAME is missing when used from another port PR: 284870 --- net-im/concord/Makefile | 4 +++- net-im/concord/files/patch-Makefile | 16 ++++++++++++++++ net-im/concord/files/patch-src_Makefile | 11 ++++++++++- net-im/concord/pkg-plist | 2 +- 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/net-im/concord/Makefile b/net-im/concord/Makefile index 91919838e58a..a1d74c3fc4d8 100644 --- a/net-im/concord/Makefile +++ b/net-im/concord/Makefile @@ -1,6 +1,7 @@ PORTNAME= concord DISTVERSIONPREFIX= v DISTVERSION= 2.3.0 +PORTREVISION= 1 CATEGORIES= net-im devel MAINTAINER= mail@souji-thenria.net @@ -17,7 +18,8 @@ GH_ACCOUNT= Cogmasters USE_LDCONFIG= yes MAKE_ARGS= DESTINCLUDE_DIR=${STAGEDIR}${PREFIX}/include/concord \ - DESTLIBDIR=${STAGEDIR}${PREFIX}/lib + DESTLIBDIR=${STAGEDIR}${PREFIX}/lib \ + ABIVERSION=1 # This is for the soname value MAKE_JOBS_UNSAFE= yes OPTIONS_DEFINE= DEBUG DEBUG_HTTP DEBUG_WEBSOCKETS EXAMPLES SIGINTCATCH diff --git a/net-im/concord/files/patch-Makefile b/net-im/concord/files/patch-Makefile index eff7f8b40ecd..fdfeb8eb25eb 100644 --- a/net-im/concord/files/patch-Makefile +++ b/net-im/concord/files/patch-Makefile @@ -9,3 +9,19 @@ static: @ CFLAGS="$(CFLAGS)" $(MAKE) -C $(CORE_DIR) +@@ -40,6 +40,7 @@ install: + @ mkdir -p $(DESTINCLUDE_DIR) + install -d $(DESTLIBDIR) + install -m 644 $(LIBDIR)/* $(DESTLIBDIR) ++ ln -fs libdiscord.so.$(ABIVERSION) $(DESTLIBDIR)/libdiscord.so + install -d $(DESTINCLUDE_DIR) + install -m 644 $(INCLUDE_DIR)/*.h $(CORE_DIR)/*.h $(GENCODECS_DIR)/*.h \ + $(DESTINCLUDE_DIR) +@@ -48,6 +49,7 @@ uninstall: + rm -rf $(PREFIX)/include/concord + rm -rf $(PREFIX)/lib/libdiscord.a + rm -rf $(PREFIX)/lib/libdiscord.so ++ rm -rf $(PREFIX)/lib/libdiscord.so.$(ABIVERSION) + rm -rf $(PREFIX)/lib/libdiscord.dylib + + docs: diff --git a/net-im/concord/files/patch-src_Makefile b/net-im/concord/files/patch-src_Makefile index 5eb202b4c985..88597041132f 100644 --- a/net-im/concord/files/patch-src_Makefile +++ b/net-im/concord/files/patch-src_Makefile @@ -1,11 +1,20 @@ --- src/Makefile.orig 2024-05-06 23:04:41 UTC +++ src/Makefile +@@ -60,7 +60,7 @@ ARLIB = $(LIBDIR)/libdiscord.a + -I$(INCLUDE_DIR) -I$(CORE_DIR) -I$(GENCODECS_DIR) -I$(PREFIX)/include + + ARLIB = $(LIBDIR)/libdiscord.a +-SOLIB = $(LIBDIR)/libdiscord.so ++SOLIB = $(LIBDIR)/libdiscord.so.$(ABIVERSION) + DYLIB = $(LIBDIR)/libdiscord.dylib + + ARFLAGS = -cqsv @@ -82,7 +82,7 @@ $(SOLIB): deps $(ARLIB): deps $(AR) $(ARFLAGS) $@ $(OBJS) $(GENCODECS_OBJ) $(CORE_OBJS) $(SOLIB): deps - $(CC) -shared -lcurl -o $@ $(OBJS) $(GENCODECS_OBJ) $(CORE_OBJS) -+ $(CC) -shared -L$(PREFIX)/lib -lcurl -o $@ $(OBJS) $(GENCODECS_OBJ) $(CORE_OBJS) ++ $(CC) -shared -Wl,-soname,libdiscord.so.$(ABIVERSION) -L$(PREFIX)/lib -lcurl -o $@ $(OBJS) $(GENCODECS_OBJ) $(CORE_OBJS) $(DYLIB): deps $(CC) -dynamiclib $(DYFLAGS) -o $@ $(OBJS) $(GENCODECS_OBJ) $(CORE_OBJS) diff --git a/net-im/concord/pkg-plist b/net-im/concord/pkg-plist index 596c4b40d1d6..3ff60e7ffb56 100644 --- a/net-im/concord/pkg-plist +++ b/net-im/concord/pkg-plist @@ -54,6 +54,7 @@ include/concord/webhook.h include/concord/websockets.h lib/libdiscord.a lib/libdiscord.so +lib/libdiscord.so.1 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/8ball %%PORTEXAMPLES%%%%EXAMPLESDIR%%/8ball.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile @@ -102,7 +103,6 @@ lib/libdiscord.so %%PORTEXAMPLES%%%%EXAMPLESDIR%%/spam.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/timers %%PORTEXAMPLES%%%%EXAMPLESDIR%%/timers.c -@comment %%PORTEXAMPLES%%%%EXAMPLESDIR%%/voice-join %%PORTEXAMPLES%%%%EXAMPLESDIR%%/voice-join.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/webhook %%PORTEXAMPLES%%%%EXAMPLESDIR%%/webhook.c