Changeset 0fd5bd5


Ignore:
Timestamp:
Apr 26, 2010, 7:49:28 PM (10 years ago)
Author:
Nelson Elhage <nelhage@mit.edu>
Branches:
master, 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:
1 edited

Legend:

Unmodified
Added
Removed
  • scripts/locker-build

    r51dbfb5 r0fd5bd5  
    8686    export PKG_CONFIG_PATH="$BARNOWL/lib/pkgconfig"
    8787
     88    SUFFIX=
     89    case $ATHENA_SYS in
     90        *_deb50)
     91            # Both Debian Lenny and Ubuntu Karmic use the _deb50
     92            # sysname, but they have different zephyr versions (soname
     93            # 3 and 4, respectively). So for that sysname, we include
     94            # the zephyr soname into the build name, and the wrapper
     95            # script picks the right one.
     96            if /sbin/ldconfig -p | grep -qF "libzephyr.so.4"; then
     97                SUFFIX=.zephyr4
     98            else
     99                SUFFIX=.zephyr3
     100            fi
     101            ;;
     102    esac
     103
    88104    CFLAGS="-I$BARNOWL/include" \
    89105        LDFLAGS="-L$BARNOWL/lib $opt_rpath$BARNOWL/lib" \
    90106        ./configure --exec-prefix="/mit/barnowl/arch/$ATHENA_SYS" \
    91107        --prefix="/mit/barnowl/builds/barnowl-$VERS" --mandir=/mit/barnowl/man \
    92         --program-suffix="-$VERS" \
     108        --program-suffix="-$VERS$SUFFIX" \
    93109        --with-zephyr --without-stack-protector \
    94110        || die "configure failed"
Note: See TracChangeset for help on using the changeset viewer.