Changeset 4e71b7e

Timestamp:

Feb 21, 2006, 12:22:44 AM (18 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

236a72e

Parents:

834dec0

Message:

r599@server (orig r597): ryan | 2005-08-05 23:16:50 -0700
General fixes, add pgsql support

File:

• scripts/untested/blfs-scripts/blfs-samba.sh (modified) (3 diffs)

scripts/untested/blfs-scripts/blfs-samba.sh

@@ -11 +11 @@
 setup_multiarch
 if [ ! "${libdirname}" = "lib" ]; then
-   extra_conf="--libdir=/usr/${libdirname}"
+   extra_conf="--libdir=/usr/${libdirname}/samba"
 fi
 
-unpack_tarball samba-${MYSQL_VER}
+unpack_tarball samba-${SAMBA_VER}
 
-# TODO, set --with-libdir here only when biarch...
-#       remove from configure below
 cd ${PKGDIR}/source
 
-max_log_init samba ${MYSQL_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+max_log_init samba ${SAMBA_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
 CC="${CC-gcc} ${ARCH_CFLAGS}" \
 CXX="${CXX-g++} ${ARCH_CFLAGS}" \
-CFLAGS="${TGT_CFLAGS}" \
-CXXLAGS="${TGT_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+CXXLAGS="-O2 -pipe ${TGT_CFLAGS}" \
 ./configure --prefix=/usr ${extra_conf} \
-   --with-libdir=/usr/${libdirname}/samba \
    --sysconfdir=/etc \
    --with-configdir=/etc/samba \
@@ -34 +31 @@
    --with-smbmount \
    --with-automount \
-   --with-python=python${suffix} \
+   --with-python \
    --with-pam \
-   --with-expsam=xml,mysql \
+   --with-expsam=xml,mysql,pgsql \
    >> ${LOGFILE} 2>&1 &&
 echo " o Configure OK" &&
 
+# BAH, samba doesn't seem to want to honour --libdir
 min_log_init ${BUILDLOGS} &&
-make ${PMFLAGS} \
+make LIBDIR=/usr/${libdirname}/samba \
    >> ${LOGFILE} 2>&1 &&
 echo " o Build OK" &&
 
 min_log_init ${INSTLOGS} &&
-make install \
+make LIBDIR=/usr/${libdirname}/samba install \
    >> ${LOGFILE} 2>&1 &&
 echo " o ALL OK" || barf
@@ -58 +56 @@
 ln -sf libnss_winbind.so /${libdirname}/libnss_winbind.so.2 &&
 ln -sf libnss_wins.so /${libdirname}/libnss_wins.so.2 &&
-cp ../examples/smb.conf.default /etc/samba &&
+cp ../examples/smb.conf.default /tmp/${PKGDIR}-${BUILDENV}/etc/samba &&
 install -m644 ../docs/*.pdf /usr/share/samba &&
 if [ -f nsswitch/pam_winbind.so ]; then