X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2Fresources%2Flinux%2Fns3%2Fccn%2Fns3ccnddceapplication.py;h=226acf07b6bae82a5f91c60a1346f65c1ca98091;hb=96ce55552a850e2fc155710a80c8453e0f201783;hp=eb97b7b1c06cc8a425adf01a4e1afb80573c0c70;hpb=2636d5f8aedcc2935e37efbdc2276ec358dec3b7;p=nepi.git

diff --git a/src/nepi/resources/linux/ns3/ccn/ns3ccnddceapplication.py b/src/nepi/resources/linux/ns3/ccn/ns3ccnddceapplication.py
index eb97b7b1..226acf07 100644
--- a/src/nepi/resources/linux/ns3/ccn/ns3ccnddceapplication.py
+++ b/src/nepi/resources/linux/ns3/ccn/ns3ccnddceapplication.py
@@ -145,15 +145,15 @@ class LinuxNS3DceCCND(LinuxNS3CCNDceApplication):
                 " ecryptfs-utils-devel libxml2-devel automake gawk " 
                 " gcc gcc-c++ git pcre-devel make ")
         elif self.simulation.node.use_deb:
-            return ( " autoconf libssl-dev libexpat-dev libpcap-dev "
+            return ( " autoconf libssl-dev libexpat1-dev libpcap-dev "
                 " libecryptfs0 libxml2-utils automake gawk gcc g++ "
                 " git-core pkg-config libpcre3-dev make ")
         return ""
 
-
     @property
     def _sources(self):
-        return "http://www.ccnx.org/releases/ccnx-0.8.1.tar.gz"
+        #return "http://www.ccnx.org/releases/ccnx-0.8.1.tar.gz"
+        return "http://www.ccnx.org/releases/ccnx-0.8.2.tar.gz"
 
     @property
     def _build(self):
@@ -164,14 +164,15 @@ class LinuxNS3DceCCND(LinuxNS3CCNDceApplication):
         return (
             # Evaluate if ccnx binaries are already installed
             " ( "
-                " test -f ${SRC}/%(tar)s && "
+                " test -f ${BIN_DCE}/ccnd && "
                 " echo 'binaries found, nothing to do' "
             " ) || "
             # If not, untar and build
             " ( "
+                " tar zxf ${SRC}/%(tar)s  && "
                 " cd %(version)s && "
                 " INSTALL_BASE=${BIN_DCE}/.. ./configure && "
-                " make MORE_LDLIBS=-pie && "
+                " make MORE_LDLIBS='-pie -rdynamic' && "
                 " make install && "
                 " cp ${BIN_DCE}/../bin/ccn* ${BIN_DCE} && "
                 " cd -"