make: use -fvisibility=hidden by default

Symbols not marked by KR_EXPORT shouldn't be visible outside
the same output binary (e.g. sbin/kresd or lib/kdns_modules/hints.so)
Also mark `engine_hint_root_file`.

diff --git a/config.mk b/config.mk
index a708c24bd0584caa3aa85a169040a6605fe18c19..2ca855901b1f8018316b7b991a6152473ccd107c 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -33,6 +33,7 @@ INSTALL := install
 BUILD_LDFLAGS += $(LDFLAGS)
 BUILD_CFLAGS := $(CFLAGS) -std=c99 -D_GNU_SOURCE -Wno-unused -Wtype-limits -Wformat -Wformat-security -Wall -I$(abspath .) -I$(abspath lib/generic) -I$(abspath contrib) -I$(abspath contrib/lmdb)
 BUILD_CFLAGS += -DPACKAGE_VERSION="\"$(VERSION)\"" -DPREFIX="\"$(PREFIX)\"" -DMODULEDIR="\"$(MODULEDIR)\""
+BUILD_CFLAGS += -fvisibility=hidden
 ifeq (,$(findstring -O,$(CFLAGS)))
        BUILD_CFLAGS += -O2
 endif

diff --git a/daemon/engine.h b/daemon/engine.h
index 8bc6670177d2351ce512f4f8329c8d971a9a662c..725aae2354d57175cf0bf6f62ca3bcd40e64c246 100644 (file)
--- a/daemon/engine.h
+++ b/daemon/engine.h
@@ -105,6 +105,8 @@ int engine_set_moduledir(struct engine *engine, const char *moduledir);
 /** Load root hints from a zonefile (or config-time default if NULL).
  *
  * @return error message or NULL (statically allocated)
+ * @note exported to be usable from the hints module.
  */
+KR_EXPORT
 const char* engine_hint_root_file(struct kr_context *ctx, const char *file);
 

diff --git a/lib/lib.mk b/lib/lib.mk
index 98b2a42571fc4e9afdf86e8f84fe275867daeaa5..fc0064fcf54c346dd2902ab6dacf630db717d8d6 100644 (file)
--- a/lib/lib.mk
+++ b/lib/lib.mk
@@ -42,7 +42,7 @@ libkres_HEADERS := \
 
 # Dependencies
 libkres_DEPEND := $(contrib)
-libkres_CFLAGS := -fvisibility=hidden -fPIC $(lmdb_CFLAGS)
+libkres_CFLAGS := -fPIC $(lmdb_CFLAGS)
 libkres_LIBS := $(contrib_TARGET) $(libknot_LIBS) $(libdnssec_LIBS) $(lmdb_LIBS) \
                                $(libuv_LIBS) $(gnutls_LIBS)
 libkres_TARGET := -L$(abspath lib) -lkres

diff --git a/modules/cookies/cookies.mk b/modules/cookies/cookies.mk
index 37c1df2b6173eea3e21a28d013ae9183a574a897..31d21209444bf7f411067e2c30456271aff1886a 100644 (file)
--- a/modules/cookies/cookies.mk
+++ b/modules/cookies/cookies.mk
@@ -1,4 +1,4 @@
-cookies_CFLAGS := -fvisibility=hidden -fPIC
+cookies_CFLAGS := -fPIC
 cookies_SOURCES := \
        modules/cookies/cookiectl.c \
        modules/cookies/cookiemonster.c \

diff --git a/modules/dnstap/dnstap.mk b/modules/dnstap/dnstap.mk
index 5311cf67d214c25feb97dc12cbac17f837c3f6f7..9a44dc2d192558030087ac2de37f567fe5c4875c 100644 (file)
--- a/modules/dnstap/dnstap.mk
+++ b/modules/dnstap/dnstap.mk
@@ -1,4 +1,4 @@
-dnstap_CFLAGS := -fvisibility=hidden -fPIC
+dnstap_CFLAGS := -fPIC
 dnstap_SOURCES := modules/dnstap/dnstap.pb-c.c modules/dnstap/dnstap.c
 dnstap_DEPEND := $(libkres) modules/dnstap/dnstap.pb-c.c # because of generated *.h
 dnstap_LIBS := $(contrib_TARGET) $(libkres_TARGET) $(libkres_LIBS) $(libprotobuf-c_LIBS) $(libfstrm_LIBS)

diff --git a/modules/hints/hints.mk b/modules/hints/hints.mk
index 15b537f16911de3c2c1683ee57d02f69772fe241..7613c18439bfc00c1e7dbd843a76e258621e28bc 100644 (file)
--- a/modules/hints/hints.mk
+++ b/modules/hints/hints.mk
@@ -1,4 +1,4 @@
-hints_CFLAGS := -fvisibility=hidden -fPIC
+hints_CFLAGS := -fPIC
 # We use a symbol that's not in libkres but the daemon.
 # On darwin this isn't accepted by default.
 hints_LDFLAGS := -Wl,-undefined -Wl,dynamic_lookup

diff --git a/modules/memcached/memcached.mk b/modules/memcached/memcached.mk
index 2eaa57c30e48a8f1c55d8ba319022d67a4e0492e..a1cfd171d140bb30c9dd23b1f7239057b92549d0 100644 (file)
--- a/modules/memcached/memcached.mk
+++ b/modules/memcached/memcached.mk
@@ -1,4 +1,4 @@
-memcached_CFLAGS := -fvisibility=hidden -fPIC
+memcached_CFLAGS := -fPIC
 memcached_SOURCES := modules/memcached/memcached.c modules/memcached/cdb_memcached.c
 memcached_DEPEND := $(libkres)
 memcached_LIBS := $(libkres_TARGET) $(libkres_LIBS) $(libmemcached_LIBS)

diff --git a/modules/redis/redis.mk b/modules/redis/redis.mk
index 250605e3491c626b24be8d0f089e1c65ce608195..d954b8e9eb6941e1439841162c4240c05b2d49a8 100644 (file)
--- a/modules/redis/redis.mk
+++ b/modules/redis/redis.mk
@@ -1,4 +1,4 @@
-redis_CFLAGS := -fvisibility=hidden -fPIC
+redis_CFLAGS := -fPIC
 redis_SOURCES := modules/redis/redis.c modules/redis/cdb_redis.c
 redis_DEPEND := $(libkres)
 redis_LIBS := $(libkres_TARGET) $(libkres_LIBS) $(hiredis_LIBS) $(libuv_LIBS)

diff --git a/modules/stats/stats.mk b/modules/stats/stats.mk
index 2349b174cad5f858129a366693e3b664ea2b8155..491fe1879f00063866fff051d8c1c88e6f935577 100644 (file)
--- a/modules/stats/stats.mk
+++ b/modules/stats/stats.mk
@@ -1,4 +1,4 @@
-stats_CFLAGS := -fvisibility=hidden -fPIC
+stats_CFLAGS := -fPIC
 stats_SOURCES := modules/stats/stats.c
 stats_DEPEND := $(libkres)
 stats_LIBS := $(contrib_TARGET) $(libkres_TARGET) $(libkres_LIBS)