From: Ken Hornstein <kenh@cmf.nrl.navy.mil>
Date: Mon, 17 Oct 2005 20:00:38 +0000 (+0000)
Subject: rename-afssetpag-dot-map-to-mapfile-20051017
X-Git-Tag: openafs-devel-1_5_0~238
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=8922ad369e1df7d9a983986b4eafe19153da55ae;p=packages%2Fo%2Fopenafs.git

rename-afssetpag-dot-map-to-mapfile-20051017


The Solaris/Linux symbol export files must be named "mapfile" (see the
definition of SHLIB_LINKER for Solaris).
---

diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in
index e74258a4e..5933eea0b 100644
--- a/src/sys/Makefile.in
+++ b/src/sys/Makefile.in
@@ -54,14 +54,14 @@ ${LIBAFSSETPAG}: ${SHLIBOBJS}
 	case ${SYS_NAME} in \
 	*_linux*) \
 	    ${SHLIB_LINKER} -Wl,-h,libafssetpag.so.${LIBAFSSETPAGMAJOR} \
-	        -o ${LIBAFSSETPAG} -Wl,--version-script=afssetpag.map \
+	        -o ${LIBAFSSETPAG} -Wl,--version-script=mapfile \
 	        ${SHLIBOBJS};; \
 	rs_aix4*) \
 	    ${SHLIB_LINKER} -o ${LIBAFSSETPAG} ${SHLIBOBJS} \
 	        -bE:afssetpag.exp;; \
 	sun*_5*) \
 	    ${SHLIB_LINKER} -h libafssetpag.so.${LIBAFSSETPAGMAJOR} \
-	        -Wl,-M afssetpag.map -o ${LIBAFSSETPAG} ${SHLIBOBJS};; \
+	        -o ${LIBAFSSETPAG} ${SHLIBOBJS};; \
 	*) \
 	    ${SHLIB_LINKER} -o ${LIBAFSSETPAG} ${SHLIBOBJS};; \
 	esac
diff --git a/src/sys/afssetpag.map b/src/sys/afssetpag.map
deleted file mode 100644
index e56525739..000000000
--- a/src/sys/afssetpag.map
+++ /dev/null
@@ -1,10 +0,0 @@
-# Export map for libafssetpag, used on Linux and Solaris to restrict
-# exports from the shared libraries to just the public ABI.  Add symbol
-# versioning while we're at it, just in case.
-
-AFSSETPAG_1.0 {
-    global:
-        lsetpag;
-    local:
-        *;
-};
diff --git a/src/sys/mapfile b/src/sys/mapfile
new file mode 100644
index 000000000..e56525739
--- /dev/null
+++ b/src/sys/mapfile
@@ -0,0 +1,10 @@
+# Export map for libafssetpag, used on Linux and Solaris to restrict
+# exports from the shared libraries to just the public ABI.  Add symbol
+# versioning while we're at it, just in case.
+
+AFSSETPAG_1.0 {
+    global:
+        lsetpag;
+    local:
+        *;
+};