STABLE14-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).

RCS file: /cvs/openafs/src/sys/Attic/afssetpag.map,v
Working file: src/sys/afssetpag.map
head: 1.2
branch:
locks: strict
access list:
keyword substitution: kv
total revisions: 4;	selected revisions: 0
description:

(cherry picked from commit 8922ad369e1df7d9a983986b4eafe19153da55ae)

diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in
index e74258a4e00197ee17d565b0dc87319537274a06..5933eea0bd6e2a8a124742a8263d69a15a406839 100644 (file)
--- 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 (file)
index e565257..0000000
--- 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 (file)
index 0000000..e565257
--- /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:
+        *;
+};