[haiku-commits] r40827 - in haiku/trunk/build: jam scripts

  • From: mattmadia@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sat, 5 Mar 2011 23:55:31 +0100 (CET)

Author: mmadia
Date: 2011-03-05 23:55:31 +0100 (Sat, 05 Mar 2011)
New Revision: 40827
Changeset: http://dev.haiku-os.org/changeset/40827
Ticket: http://dev.haiku-os.org/ticket/7286

Modified:
   haiku/trunk/build/jam/HaikuCD
   haiku/trunk/build/jam/HaikuImage
   haiku/trunk/build/jam/ImageRules
   haiku/trunk/build/scripts/build_haiku_image
Log:
As per Ingo's comment 13 in #7286, removed support for isGCCAgnostic.
There should be separate gcc 2 and gcc 4 packages instead.


Modified: haiku/trunk/build/jam/HaikuCD
===================================================================
--- haiku/trunk/build/jam/HaikuCD       2011-03-05 22:13:12 UTC (rev 40826)
+++ haiku/trunk/build/jam/HaikuCD       2011-03-05 22:55:31 UTC (rev 40827)
@@ -25,8 +25,6 @@
 AddVariableToScript $(script) : outputDir : $(HAIKU_OUTPUT_DIR) ;
 AddVariableToScript $(script) : tmpDir : $(HAIKU_TMP_DIR) ;
 AddVariableToScript $(script) : isCD : 1 ;
-AddVariableToScript $(script) : gccVersion : $(HAIKU_GCC_VERSION[1]) ;
-AddVariableToScript $(script) : isHybridBuild : $(isHybridBuild) ;
 AddVariableToScript $(script) : cdLabel : $(HAIKU_CD_LABEL) ;
 AddVariableToScript $(script) : addBuildCompatibilityLibDir
        : $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ;

Modified: haiku/trunk/build/jam/HaikuImage
===================================================================
--- haiku/trunk/build/jam/HaikuImage    2011-03-05 22:13:12 UTC (rev 40826)
+++ haiku/trunk/build/jam/HaikuImage    2011-03-05 22:55:31 UTC (rev 40827)
@@ -771,8 +771,6 @@
 AddVariableToScript $(script) : tmpDir : $(HAIKU_TMP_DIR) ;
 AddVariableToScript $(script) : installDir : $(HAIKU_INSTALL_DIR) ;
 #AddVariableToScript $(script) : isImage : 1 ;
-AddVariableToScript $(script) : gccVersion : $(HAIKU_GCC_VERSION[1]) ;
-AddVariableToScript $(script) : isHybridBuild : $(isHybridBuild) ;
 AddVariableToScript $(script) : imageSize : $(HAIKU_IMAGE_SIZE) ;
 AddVariableToScript $(script) : imageLabel : $(HAIKU_IMAGE_LABEL) ;
 AddVariableToScript $(script) : addBuildCompatibilityLibDir

Modified: haiku/trunk/build/jam/ImageRules
===================================================================
--- haiku/trunk/build/jam/ImageRules    2011-03-05 22:13:12 UTC (rev 40826)
+++ haiku/trunk/build/jam/ImageRules    2011-03-05 22:55:31 UTC (rev 40827)
@@ -283,17 +283,16 @@
 }
 
 rule ExtractArchiveToContainer container : directoryTokens : archiveFile
-       : extractedSubDir : isGCCAgnostic
+       : extractedSubDir
 {
        # ExtractArchiveToContainer <container> : <directory> : <archiveFile>
-       #       : <extractedSubDir> : <isGCCAgnostic> ;
+       #       : <extractedSubDir> ;
 
        local directory = [ AddDirectoryToContainer $(container)
                : $(directoryTokens) ] ;
 
        ARCHIVE_FILES_TO_INSTALL on $(directory) += $(archiveFile) ;
        ARCHIVE_SUBDIR_TO_INSTALL_FROM on $(archiveFile) = $(extractedSubDir) ;
-       ARCHIVE_IS_GCC_AGNOSTIC on $(archiveFile) = $(isGCCAgnostic) ;
 }
 
 rule AddDriversToContainer container : relativeDirectoryTokens : targets
@@ -608,11 +607,6 @@
                        ARCHIVE_SUBDIR_TO_INSTALL_FROM on $(dummyTarget) =
                                $(extractedSubDir:E=.) ;
 
-                       local isGCCAgnostic = [ on $(archiveFile)
-                               return $(ARCHIVE_IS_GCC_AGNOSTIC) ] ;
-                       ARCHIVE_IS_GCC_AGNOSTIC on $(dummyTarget) =
-                               $(isGCCAgnostic:E=false) ;
-
                        Depends $(dummyTarget) : $(initScript) $(archiveFile)
                                $(serializationDependency) ;
                        Depends $(script) : $(dummyTarget) ;
@@ -628,8 +622,7 @@
 actions AddExtractFileToContainerExtractFilesScript
 {
        echo extractFile "\"$(2[2])\"" "\"$(TARGET_DIR)\"" \
-               "\"$(ARCHIVE_SUBDIR_TO_INSTALL_FROM)\"" \
-               "\"$(ARCHIVE_IS_GCC_AGNOSTIC)\"" >> $(2[1])
+               "\"$(ARCHIVE_SUBDIR_TO_INSTALL_FROM)\"" >> $(2[1])
 }
 
 
@@ -734,16 +727,16 @@
 }
 
 rule ExtractArchiveToHaikuImage dirTokens : archiveFile : alwaysUpdate
-       : extractedSubDir : isGCCAgnostic
+       : extractedSubDir
 {
        # ExtractArchiveToHaikuImage <dirTokens> : <archiveFile> : 
<alwaysUpdate>
-       #       : <extractedSubDir> : <isGCCAgnostic> ;
+       #       : <extractedSubDir> ;
 
        # If the image shall only be updated, we extract only, if explicitely
        # requested.
        if ! [ IsUpdateHaikuImageOnly ] || $(alwaysUpdate) {
                ExtractArchiveToContainer $(HAIKU_IMAGE_CONTAINER_NAME) : 
$(dirTokens)
-                       : $(archiveFile) : $(extractedSubDir) : 
$(isGCCAgnostic) ;
+                       : $(archiveFile) : $(extractedSubDir) ;
        }
 }
 
@@ -830,7 +823,6 @@
 }
 
 rule InstallOptionalHaikuImagePackage package : url : dirTokens : isCDPackage
-       : isGCCAgnostic
 {
        # download archive file
        local archiveFile = [ DownloadFile $(package) : $(url) ] ;
@@ -840,16 +832,9 @@
                # image!
                # copy onto image
                AddFilesToHaikuImage _packages_ : $(archiveFile) ;
-               #if $(isGCCAgnostic) {
-               #       TODO: The archives would need to be marked whether they 
are
-               #       gcc-agnostic (e.g. via attribute). Installer's 
UnzipEngine would
-               #       also need to be updated, to read this attribute and 
create the
-               #       alt gcc dir and symlinks as needed.
-               #}
        } else {
                # extract onto image
-               ExtractArchiveToHaikuImage $(dirTokens) : $(archiveFile) : :
-                       : $(isGCCAgnostic) ;
+               ExtractArchiveToHaikuImage $(dirTokens) : $(archiveFile) ;
        }
 }
 

Modified: haiku/trunk/build/scripts/build_haiku_image
===================================================================
--- haiku/trunk/build/scripts/build_haiku_image 2011-03-05 22:13:12 UTC (rev 
40826)
+++ haiku/trunk/build/scripts/build_haiku_image 2011-03-05 22:55:31 UTC (rev 
40827)
@@ -6,8 +6,6 @@
 # outputDir
 # tmpDir
 # addBuildCompatibilityLibDir
-# gccVersion
-# isHybridBuild
 # The following are only for image types:
 # installDir
 # isImage
@@ -149,7 +147,6 @@
        archiveFile=$1
        targetExtractedDir=$2
        extractedSubDir=$3
-       isGCCAgnostic=$4
 
        echo "Extracting $archiveFile ..."
 
@@ -176,63 +173,12 @@
                rm $extractDir/.OptionalPackageDescription
        fi
 
-       if [ "$isGCCAgnostic" = "true" ] && [ $isHybridBuild ] ; then
-               extractedLibs=`find "$extractDir/$extractedSubDir/" -name 
"*.so"`
-               moreExtractedLibs=`find "$extractDir/$extractedSubDir/" -name 
"*.so.*"`
-               staticLibs=`find "$extractDir/$extractedSubDir/" -name "*.a"`
-               #NOTE: should we symlink libtool's *.la files?
-               #laLibs=`find "$extractDir/$extractedSubDir/" -name "*.la"`
-               createSymlinksForHybrid $extractedLibs $moreExtractedLibs 
$staticLibs
-       fi
-
        $cp -r "${sPrefix}$extractDir/$extractedSubDir/." 
"${tPrefix}$targetExtractedDir"
 
        $rmAttrs -rf "$extractDir"
 }
 
 
-createSymlinksForHybrid()
-{
-       # createSymlinksForHybrid <libraries>
-
-       # Determine the alternative gcc subdir.
-       if [ $gccVersion -eq 2 ]; then
-               gccAltDir=gcc4
-       else
-               gccAltDir=gcc2
-       fi
-
-       # Iterate over the library file paths that were passed in.
-       for srcPathLib in $@; do
-               # determine the relative path of the library
-               relPathLib=`echo $srcPathLib | \
-                       sed -e "s:${extractDir}/${extractedSubDir}/::"`
-               relPath=`dirname $relPathLib`
-
-               # check if that relative path is one of the standard library 
paths
-               standardLibPaths="system/lib common/lib home/config/lib"
-               isStandardPath=
-               for stdLibPath in $standardLibPaths; do
-                       if [ "$relPath" = "$stdLibPath" ]; then
-                               isStandardPath=true
-                               break
-                       fi
-               done
-
-               # create alt gcc symlinks for libs inside standard paths
-               if [ $isStandardPath ]; then
-                       srcPath=`dirname $srcPathLib`
-                       srcLib=`basename $srcPathLib`
-                       destLinkDir="${srcPath}/${gccAltDir}"
-                       destLinkTarget="../$srcLib"
-
-                       mkdir -p $destLinkDir
-                       ln -sf $destLinkTarget $destLinkDir
-               fi
-       done
-}
-
-
 mkdir -p $tmpDir
 copyrightsFile=$tmpDir/copyrights
 $rmAttrs -f $copyrightsFile


Other related posts:

  • » [haiku-commits] r40827 - in haiku/trunk/build: jam scripts - mattmadia