View | Details | Raw Unified | Return to bug 1773
Collapse All | Expand All

(-)a/bake/ModuleBuild.py (-1 / +3 lines)
 Lines 31-36    Link Here 
31 
import commands
 31 
import commands
32 
import re
 32 
import re
33 
import sys
 33 
import sys
34 
import shlex
34 
from bake.Utils import ModuleAttributeBase
 35 
from bake.Utils import ModuleAttributeBase
35 
from bake.Exceptions import NotImplemented
 36 
from bake.Exceptions import NotImplemented
36 
from bake.Exceptions import TaskError
37 
from bake.Exceptions import TaskError
 Lines 756-762    Link Here 
756 
            if not "--prefix" in command:
 757 
            if not "--prefix" in command:
757 
                command = command + ' --prefix=' + env.objdir
 758 
                command = command + ' --prefix=' + env.objdir
758
759
759 
            command= bake.Utils.split_args(command)
 760 
            #command= bake.Utils.split_args(command)
761 
            command = shlex.split(command)
760 
            env.run(command, directory=env.objdir)
 762 
            env.run(command, directory=env.objdir)
761
763
762
764
(-)a/bakeconf.xml (-7 / +8 lines)
 Lines 122-128    Link Here 
122 
        <attribute name="LDFLAGS" value="-pie"/>
 122 
        <attribute name="LDFLAGS" value="-pie"/>
123 
        <attribute name="ignore_predefined_flags" value="True"/>
 123 
        <attribute name="ignore_predefined_flags" value="True"/>
124 
        <attribute name="install_arguments" value="DESTDIR=$INSTALLDIR" />
 124 
        <attribute name="install_arguments" value="DESTDIR=$INSTALLDIR" />
125 
        <attribute name="build_arguments" value="CCOPTS+=-fpic CCOPTS+=-D_GNU_SOURCE CCOPTS+=-O0 CCOPTS+=-U_FORTIFY_SOURCE LDFLAGS=-pie DEFINES+=-I$SRCDIR/../mptcp/arch/sim/include/ DEFINES+=-I$SRCDIR/../mptcp/include/uapi/ DEFINES+=-I$SRCDIR/../mptcp/include"/>
 125 
        <attribute name="build_arguments" value="CCOPTS+=-fpic CCOPTS+=-D_GNU_SOURCE CCOPTS+=-O0 CCOPTS+=-U_FORTIFY_SOURCE LDFLAGS=-pie LDFLAGS+=-rdynamic DEFINES+=-I$SRCDIR/../mptcp/arch/sim/include/ DEFINES+=-I$SRCDIR/../mptcp/include/uapi/ DEFINES+=-I$SRCDIR/../mptcp/include"/>
126 
      </build>
 126 
      </build>
127 
    </module>
 127 
    </module>
128 

          128
          

        

  

    

    

       Lines 174-180
       
    
  Link Here 
    

  

        

          174
          
      <depends_on name="libexpat-dev" optional="False"/>

          174
          
      <depends_on name="libexpat-dev" optional="False"/>

        

        

          175
          
      <build type="make" objdir="yes">

          175
          
      <build type="make" objdir="yes">

        

        

          176
          
        <attribute name="pre_installation" value="cd $SRCDIR;INSTALL_BASE=$INSTALLDIR ./configure;mkdir $INSTALLDIR/include;mkdir $INSTALLDIR/lib;mkdir $INSTALLDIR/bin"/>

          176
          
        <attribute name="pre_installation" value="cd $SRCDIR;INSTALL_BASE=$INSTALLDIR ./configure;mkdir $INSTALLDIR/include;mkdir $INSTALLDIR/lib;mkdir $INSTALLDIR/bin"/>

        

          
            

              177
              
        <attribute name="build_arguments" value="MORE_LDLIBS=-pie"/>


              177
              
        <attribute name="build_arguments" value="MORE_LDLIBS=-pie COPT+=-rdynamic"/>

            

        

          178
          
        <attribute name="new_variable" value="INSTALL_BASE=$INSTALLDIR" />

          178
          
        <attribute name="new_variable" value="INSTALL_BASE=$INSTALLDIR" />

        

        

          179
          
      </build>

          179
          
      </build>

        

        

          180
          
     </module>

          180
          
     </module>

        

  

    

    

       Lines 187-192
       
    
  Link Here 
    

  

        

          187
          
      <build type="make" objdir="yes">

          187
          
      <build type="make" objdir="yes">

        

        

          188
          
        <attribute name="pre_installation" value="cd $SRCDIR;./configure --prefix=$INSTALLDIR"/>

          188
          
        <attribute name="pre_installation" value="cd $SRCDIR;./configure --prefix=$INSTALLDIR"/>

        

        

          189
          
        <attribute name="patch" value="$SRCDIR/../ns-3-dce/utils/iperf_4_dce.patch"/>

          189
          
        <attribute name="patch" value="$SRCDIR/../ns-3-dce/utils/iperf_4_dce.patch"/>

        

            

              
              
              190
              
        <attribute name="build_arguments" value="LDFLAGS=-pie LDFLAGS+=-rdynamic"/>

            

        

          190
          
      </build>

          191
          
      </build>

        

        

          191
          
     </module>

          192
          
     </module>

        

        

          192
          

          193
          

        

  

    

    

       Lines 264-270
       
    
  Link Here 
    

  

        

          264
          
        <attribute name="LDFLAGS" value="-pie"/>

          265
          
        <attribute name="LDFLAGS" value="-pie"/>

        

        

          265
          
        <attribute name="ignore_predefined_flags" value="True"/>

          266
          
        <attribute name="ignore_predefined_flags" value="True"/>

        

        

          266
          
         <attribute name="install_arguments" value="DESTDIR=$INSTALLDIR" />

          267
          
         <attribute name="install_arguments" value="DESTDIR=$INSTALLDIR" />

        

          
            

              267
              
        <attribute name="build_arguments" value="CCOPTS+=-fpic CCOPTS+=-D_GNU_SOURCE CCOPTS+=-O0 CCOPTS+=-U_FORTIFY_SOURCE LDFLAGS=-pie"/>


              268
              
        <attribute name="build_arguments" value="CCOPTS+=-fpic CCOPTS+=-D_GNU_SOURCE CCOPTS+=-O0 CCOPTS+=-U_FORTIFY_SOURCE LDFLAGS=-pie LDFLAGS+=-rdynamic"/>

            

        

          268
          
      </build>

          269
          
      </build>

        

        

          269
          
     </module>

          270
          
     </module>

        

        

          270
          

          271
          

        

  

    

    

       Lines 329-335
       
    
  Link Here 
    

  

        

          329
          
        <attribute name="extract_directory" value="wget-1.14"/>

          330
          
        <attribute name="extract_directory" value="wget-1.14"/>

        

        

          330
          
      </source>

          331
          
      </source>

        

        

          331
          
      <build type="make" objdir="yes">

          332
          
      <build type="make" objdir="yes">

        

          
            

              332
              
        <attribute name="pre_installation" value="cd $SRCDIR; CFLAGS=-fPIC LDFLAGS=-pie ./configure --disable-opie --disable-digest --disable-ntlm --disable-largefile --disable-threads --disable-nls --disable-rpath --disable-iri --without-ssl --without-zlib --without-libiconv-prefix --without-libintl-prefix --without-libpth-prefix --without-included-regex --prefix=$INSTALLDIR"/>


              333
              
        <attribute name="pre_installation" value="cd $SRCDIR; CFLAGS='-fPIC -g' LDFLAGS='-pie -rdynamic' ./configure --disable-opie --disable-digest --disable-ntlm --disable-largefile --disable-threads --disable-nls --disable-rpath --disable-iri --without-ssl --without-zlib --without-libiconv-prefix --without-libintl-prefix --without-libpth-prefix --without-included-regex --prefix=$INSTALLDIR"/>

            

        

          333
          
      </build>

          334
          
      </build>

        

        

          334
          
     </module>

          335
          
     </module>

        

        

          335
          

          336
          

        

  

    

    

       Lines 367-373
       
    
  Link Here 
    

  

        

          367
          
           if not jobs == -1:

          368
          
           if not jobs == -1:

        

        

          368
          
               jobstr = ['-j', str(jobs)]

          369
          
               jobstr = ['-j', str(jobs)]

        

        

          369
          
           env.run(['make', 'CFLAGS=-fpic', 'CFLAGS+=-D_GNU_SOURCE', 'CFLAGS+=-g',

          370
          
           env.run(['make', 'CFLAGS=-fpic', 'CFLAGS+=-D_GNU_SOURCE', 'CFLAGS+=-g',

        

          
            

              370
              
           'CFLAGS+=-Wstrict-prototypes', 'CFLAGS+=-Wall', 'LDFLAGS=-pie', 


              371
              
           'CFLAGS+=-Wstrict-prototypes', 'CFLAGS+=-Wall', 'LDFLAGS=-pie', 'LDFLAGS+=-rdynamic',

            

        

          371
          
           'ping', 'ping6'] + jobstr,

          372
          
           'ping', 'ping6'] + jobstr,

        

        

          372
          
           directory=env.srcdir)

          373
          
           directory=env.srcdir)

        

        

          373
          
           env.run(['mkdir', '-p' , env.installdir + '/bin_dce/'],

          374
          
           env.run(['mkdir', '-p' , env.installdir + '/bin_dce/'],

        

  

    

    

       Lines 404-410
       
    
  Link Here 
    

  

        

          404
          
       <build type="autotools" objdir="no">

          405
          
       <build type="autotools" objdir="no">

        

        

          405
          
         <attribute name="supported_os" value="linux;linux2"/>

          406
          
         <attribute name="supported_os" value="linux;linux2"/>

        

        

          406
          
         <attribute name="maintainer" value="yes" />

          407
          
         <attribute name="maintainer" value="yes" />

        

          
            

              407
              
         <attribute name="configure_arguments" value="./configure CFLAGS=-fPIC  LDFLAGS=-pie --prefix=$INSTALLDIR --enable-vt --with-builtin-crypto"/>


              408
              
         <attribute name="configure_arguments" value="./configure CFLAGS=-fPIC  LDFLAGS='-pie -rdynamic' --prefix=$INSTALLDIR --enable-vt --with-builtin-crypto"/>

            

        

          408
          
         <attribute name="install_arguments" value="-n" />

          409
          
         <attribute name="install_arguments" value="-n" />

        

        

          409
          
         <attribute name="post_installation" value="cd $SRCDIR; mkdir $INSTALLDIR/bin_dce; /bin/cp -f src/mip6d  $INSTALLDIR/bin_dce"/>

          410
          
         <attribute name="post_installation" value="cd $SRCDIR; mkdir $INSTALLDIR/bin_dce; /bin/cp -f src/mip6d  $INSTALLDIR/bin_dce"/>

        

        

          410
          
       </build>

          411
          
       </build>

        

  

    

    

       Lines 459-465
       
    
  Link Here 
    

  

        

          459
          
       <depends_on name="indent" optional="False"/>

          460
          
       <depends_on name="indent" optional="False"/>

        

        

          460
          
       <depends_on name="gawk" optional="False"/>

          461
          
       <depends_on name="gawk" optional="False"/>

        

        

          461
          
       <build type="make" objdir="yes">

          462
          
       <build type="make" objdir="yes">

        

          
            

              462
              
         <attribute name="pre_installation" value="cd $SRCDIR; CFLAGS='-fPIC -g' LDFLAGS=-pie ./configure --disable-shared --enable-static --disable-user --disable-group --disable-capabilities --prefix=$INSTALLDIR"/>


              463
              
         <attribute name="pre_installation" value="cd $SRCDIR; CFLAGS='-fPIC -g' LDFLAGS='-pie -rdynamic' ./configure --disable-shared --enable-static --disable-user --disable-group --disable-capabilities --prefix=$INSTALLDIR"/>

            

        

          463
          
         <attribute name="install_arguments" value="-n" />

          464
          
         <attribute name="install_arguments" value="-n" />

        

        

          464
          
         <attribute name="post_installation" value="cd $SRCDIR; mkdir $INSTALLDIR/bin_dce; /bin/cp zebra/zebra $INSTALLDIR/bin_dce;/bin/cp ripd/ripd $INSTALLDIR/bin_dce;/bin/cp ripngd/ripngd $INSTALLDIR/bin_dce;/bin/cp ospfd/ospfd $INSTALLDIR/bin_dce;/bin/cp ospf6d/ospf6d $INSTALLDIR/bin_dce;/bin/cp bgpd/bgpd $INSTALLDIR/bin_dce"/>

          465
          
         <attribute name="post_installation" value="cd $SRCDIR; mkdir $INSTALLDIR/bin_dce; /bin/cp zebra/zebra $INSTALLDIR/bin_dce;/bin/cp ripd/ripd $INSTALLDIR/bin_dce;/bin/cp ripngd/ripngd $INSTALLDIR/bin_dce;/bin/cp ospfd/ospfd $INSTALLDIR/bin_dce;/bin/cp ospf6d/ospf6d $INSTALLDIR/bin_dce;/bin/cp bgpd/bgpd $INSTALLDIR/bin_dce"/>

        

        

          465
          
       </build>

          466
          
       </build>

        






  

  Return to bug 1773