Changeset 0fd5bd5 for scripts

Timestamp:

Apr 26, 2010, 7:49:28 PM (14 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.6, release-1.7, release-1.8, release-1.9

Children:

751ae8c

Parents:

a4b0572

git-author:

David Benjamin <davidben@mit.edu> (04/24/10 17:14:19)

git-committer:

Nelson Elhage <nelhage@mit.edu> (04/26/10 19:49:28)

Message:

Incorporate the zephyr soname into the executable for *_deb50.

File:

• scripts/locker-build (modified) (1 diff)

scripts/locker-build

@@ -86 +86 @@
     export PKG_CONFIG_PATH="$BARNOWL/lib/pkgconfig"
 
+    SUFFIX=
+    case $ATHENA_SYS in
+        *_deb50)
+            # Both Debian Lenny and Ubuntu Karmic use the _deb50
+            # sysname, but they have different zephyr versions (soname
+            # 3 and 4, respectively). So for that sysname, we include
+            # the zephyr soname into the build name, and the wrapper
+            # script picks the right one.
+            if /sbin/ldconfig -p | grep -qF "libzephyr.so.4"; then
+                SUFFIX=.zephyr4
+            else
+                SUFFIX=.zephyr3
+            fi
+            ;;
+    esac
+
     CFLAGS="-I$BARNOWL/include" \
         LDFLAGS="-L$BARNOWL/lib $opt_rpath$BARNOWL/lib" \
         ./configure --exec-prefix="/mit/barnowl/arch/$ATHENA_SYS" \
         --prefix="/mit/barnowl/builds/barnowl-$VERS" --mandir=/mit/barnowl/man \
-        --program-suffix="-$VERS" \
+        --program-suffix="-$VERS$SUFFIX" \
         --with-zephyr --without-stack-protector \
         || die "configure failed"