Changeset 0fd8a9d

Timestamp:

10/15/2005 11:59:59 AM (19 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

0.2, 1.0, 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

fd691b4

Parents:

3cc6f47

Message:

Added support for UTF-8 branch packages and patches.

File:

• jhalfs (modified) (4 diffs)

jhalfs

@@ -314 +314 @@
   -e '/generic/d' >> packages
   echo `grep "glibc" packages | sed 's@glibc@glibc-linuxthreads@'` >> packages
+  # If we are buildind the UTF-8 branch, the glibc-libidn package is required
+  if grep -q "man-db-version" $BOOK/general.ent ; then
+    echo `grep "glibc" packages | sed 's@glibc@glibc-libidn@'` >> packages
+  fi
   grep "ENTITY" $BOOK/patches.ent | sed -e 's/.* "//' -e 's/">//' >> patches
 
@@ -324 +328 @@
   cd $BUILDDIR/sources
 
-  # Hackish fix for the bash-doc and glibc-linuxthreads packages that
+  # Hackish fix for the bash-doc and glibc-{linuxthreads,libidn} packages that
   # doesn't conform to norms in the URL scheme.
-  DIR=`echo $1 | sed -e 's@-doc@@' -e 's@-linuxthreads@@'`
+  DIR=`echo $1 | sed -e 's@-doc@@' -e 's@-linuxthreads@@' -e 's@-libidn@@'`
 
   # Find the md5 sum for this package.
@@ -381 +385 @@
     for i in `cat $JHALFSDIR/packages` ; do
       PKG=`echo $i | sed 's/-version.*//'`
+      # Needed for Groff patchlevel patch on UTF-8 branch
+      GROFFLEVEL=`echo $i | sed -e 's/groff-patchlevel //' -e 's/"//g'`
 
       # Someone used some silly entities right next to the valid package entities.
-      if [ "$PKG" = "expect-lib" -o "$PKG" = "linux-dl" ] ; then continue ; fi
+      if [ "$PKG" = "expect-lib" -o "$PKG" = "linux-dl" -o "$PKG" = "groff-patchlevel" ] ; then continue ; fi
 
       VRS=`echo $i | sed -e 's/.* //' -e 's/"//g'`
@@ -394 +400 @@
       for patch in `grep "$PKG-&$PKG" $JHALFSDIR/patches` ; do
         PATCH=`echo $patch | sed 's@&'$PKG'-version;@'$VRS'@'`
+        download $PKG $PATCH
+      done
+      # Needed for Groff patchlevel patch on UTF-8 branch
+      for patch in `grep "$PKG_&$PKG" $JHALFSDIR/patches` ; do
+        PATCH=`echo $patch | sed 's@&'$PKG'-version;-&'$PKG'-patchlevel;@'$VRS'-'$GROFFLEVEL'@'`
         download $PKG $PATCH
       done