SELinux Archive on lore.kernel.org
 help / color / Atom feed
From: bill.c.roberts@gmail.com
To: joshua.brindle@crunchydata.com
Cc: bill.c.roberts@gmail.com, omosnace@redhat.com,
	selinux@vger.kernel.org, stephen.smalley.work@gmail.com,
	william.c.roberts@intel.com
Subject: [PATCH 2/2] cil: re-enable DISABLE_SYMVER define
Date: Thu, 26 Mar 2020 10:46:41 -0500
Message-ID: <20200326154641.7253-3-william.c.roberts@intel.com> (raw)
In-Reply-To: <20200326154641.7253-1-william.c.roberts@intel.com>

From: William Roberts <william.c.roberts@intel.com>

Fix issues like:
<inline asm>:1:1: error: unknown directive
.symver cil_build_policydb_pdb,        cil_build_policydb@LIBSEPOL_1.0

Which was caused by the DISABLE_SYMVER define not being defined
for static, Mac or Android builds.

Signed-off-by: William Roberts <william.c.roberts@intel.com>
---
 libsepol/cil/src/cil.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libsepol/cil/src/cil.c b/libsepol/cil/src/cil.c
index 12cc28eff389..c8e27c04c954 100644
--- a/libsepol/cil/src/cil.c
+++ b/libsepol/cil/src/cil.c
@@ -51,6 +51,10 @@
 #include "cil_policy.h"
 #include "cil_strpool.h"
 
+#if !defined(SHARED) || defined(ANDROID) || defined(__APPLE__)
+    #define DISABLE_SYMVER 1
+#endif
+
 #ifndef DISABLE_SYMVER
 asm(".symver cil_build_policydb_pdb,        cil_build_policydb@LIBSEPOL_1.0");
 asm(".symver cil_build_policydb_create_pdb, cil_build_policydb@@LIBSEPOL_1.1");
-- 
2.17.1


  parent reply index

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-09 15:25 libsepol drop dso.h bill.c.roberts
2020-03-09 15:25 ` [PATCH 1/2] libsepol/dso: drop hidden_proto and hidden_def bill.c.roberts
2020-03-10 20:10   ` Stephen Smalley
2020-03-10 20:15     ` William Roberts
2020-03-09 15:25 ` [PATCH 2/2] libsepol/Makefile: add -fno-semantic-interposition bill.c.roberts
2020-03-10 21:08 ` V2 libsepol drop dso.h bill.c.roberts
2020-03-10 21:08   ` [PATCH v2 1/3] libsepol/dso: drop hidden_proto and hidden_def bill.c.roberts
2020-03-10 21:08   ` [PATCH v2 2/3] libsepol/Makefile: add -fno-semantic-interposition bill.c.roberts
2020-03-10 21:08   ` [PATCH v2 3/3] lbespol: remove wild cards in mapfile bill.c.roberts
2020-03-11 18:53     ` Stephen Smalley
2020-03-11 18:54       ` Stephen Smalley
2020-03-12 13:59         ` William Roberts
2020-03-12 20:22           ` Stephen Smalley
2020-03-12 21:42             ` William Roberts
2020-03-13 11:03               ` Ondrej Mosnacek
2020-03-13 14:22                 ` William Roberts
2020-03-13 14:41                   ` Ondrej Mosnacek
2020-03-13 14:51                     ` William Roberts
2020-03-17 17:46               ` Stephen Smalley
2020-03-19 19:46                 ` William Roberts
2020-03-19 19:48                   ` [PATCH] cil: drop remaining dso.h include bill.c.roberts
2020-03-20  8:08                     ` Ondrej Mosnacek
2020-03-23 15:35                       ` William Roberts
2020-03-26 15:16                         ` Joshua Brindle
2020-03-26 15:35                           ` William Roberts
2020-03-26 15:46                           ` cil: Fix DISABLE_SYMVER support and drop last dso.h bill.c.roberts
2020-03-26 15:46                             ` [PATCH 1/2] cil: rm dead dso.h file bill.c.roberts
2020-03-26 15:46                             ` bill.c.roberts [this message]
2020-03-26 15:47                             ` cil: Fix DISABLE_SYMVER support and drop last dso.h William Roberts
2020-03-26 16:05                               ` Joshua Brindle
2020-03-26 16:18                                 ` William Roberts
2020-03-27 14:27                                   ` William Roberts
2020-03-27 14:47                                     ` Stephen Smalley
2020-03-27 15:02                                       ` William Roberts
2020-03-26 16:50                           ` [PATCH] cil: drop remaining dso.h include Stephen Smalley
2020-03-26 16:51                             ` William Roberts

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200326154641.7253-3-william.c.roberts@intel.com \
    --to=bill.c.roberts@gmail.com \
    --cc=joshua.brindle@crunchydata.com \
    --cc=omosnace@redhat.com \
    --cc=selinux@vger.kernel.org \
    --cc=stephen.smalley.work@gmail.com \
    --cc=william.c.roberts@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

SELinux Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/selinux/0 selinux/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 selinux selinux/ https://lore.kernel.org/selinux \
		selinux@vger.kernel.org
	public-inbox-index selinux

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.selinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git