Changeset 87

Timestamp:

04/17/07 16:16:29 (17 years ago)

Author:

kdeugau

Message:

/trunk

Handle BuildArch (more or less), and allow debbuild to run "correctly"
without modification on any arch.

File:

• trunk/debbuild (modified) (12 diffs)

trunk/debbuild

@@ -78 +78 @@
                 's' => 'Build source'
         );
+# Ah, the joys of multiple architectures.  :(  Feh.
+# As copied from rpm
+my %optflags = ( 'i386' =>      '-O2 -g -march=i386 -mcpu=i686',
+                'amd64' =>      '-O2 -g'
+        );
+my $hostarch;   # we set this later...
 my $scriptletbase =
 q(#!/bin/sh
@@ -83 +89 @@
   RPM_SOURCE_DIR="%{_topdir}/SOURCES"
   RPM_BUILD_DIR="%{_topdir}/BUILD"
-  RPM_OPT_FLAGS="-O2 -g -march=i386 -mcpu=i686"
-  RPM_ARCH="i386"
+  RPM_OPT_FLAGS="%{optflags}"
+  RPM_ARCH="%{_arch}"
   RPM_OS="linux"
   export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_ARCH RPM_OS
@@ -99 +105 @@
   s/=(.+)/="$1"/;
   $scriptletbase .= "  $_";
+  ($hostarch) = (/^DEB_HOST_ARCH="(.+)"$/) if /DEB_HOST_ARCH/;
 }
 $scriptletbase .=
@@ -153 +160 @@
     $pkgdata{$pkg}{name} =~ tr/_/-/;
 
-    my $pkgfullname = "$pkgdata{$pkg}{name}_$pkgdata{$pkg}{version}-$pkgdata{main}{release}_i386.deb";
+    my $pkgfullname = "$pkgdata{$pkg}{name}_$pkgdata{$pkg}{version}-$pkgdata{main}{release}_$pkgdata{$pkg}{arch}.deb";
 
     print "$pkgfullname\n" if $filelist{$pkg};
@@ -402 +409 @@
   open SPECFILE,"<$specfile" or die "specfile ($specfile) barfed: $!";
 
+  my $buildarch = $hostarch;
+
 LINE: while (<SPECFILE>) {
     next if /^#/;       # Ignore comments...
@@ -432 +441 @@
         $pkgdata{$subname}{name} = $subname;
         $pkgdata{$subname}{version} = $pkgdata{main}{version};
+  # Build "same arch as previous package found" by default.  Where rpm just picks the
+  # *very* last one, we want to allow arch<native>+arch-all
+  # (eg, Apache is i386, but apache-manual is all)
+        $pkgdata{$subname}{arch} = $buildarch;  # Since it's likely subpackages will NOT have a BuildArch line...
         while (<SPECFILE>) {
           redo LINE if /^\%/;
-          if (my ($dname,$dvalue) = (/^(Summary|Group|Version|Requires|Provides):\s+(.+)$/i)) {
+          if (my ($dname,$dvalue) = (/^(Summary|Group|Version|Requires|Provides|BuildArch(?:itecture)?):\s+(.+)$/i)) {
             $dname =~ tr/[A-Z]/[a-z]/;
+            if ($dname =~ /^BuildArch/i) {
+              $buildarch = $dvalue;     # Emulate rpm's behaviour to a degree
+              $dname = 'arch';
+            }
             $pkgdata{$subname}{$dname} = expandmacros($dvalue, 'gp');
           }
@@ -673 +690 @@
         }
         chomp $pkgdata{main}{$patchname};
+      } elsif (/^buildarch(?:itecture)?:\s+(.+)/i) {
+        $pkgdata{main}{arch} = $1;
+        $buildarch = $pkgdata{main}{arch};
       } elsif (/^buildreq(?:uires)?:\s+(.+)/i) {
         $buildreq .= ", $1";
@@ -789 +809 @@
 # Should handle simple subpackages
 sub binpackage {
-  # Make sure we have somewhere to write the .deb file
-  if (!-e "$topdir/DEBS/i386") {
-    mkdir "$topdir/DEBS/i386";
-  }
 
   foreach my $pkg (@pkglist) {
+
+    $pkgdata{$pkg}{arch} = $hostarch if !$pkgdata{$pkg}{arch};  # Just In Case.
+    $pkgdata{$pkg}{arch} =~ s/^noarch/all/ig;
+
+    # Make sure we have somewhere to write the .deb file
+    if (!-e "$topdir/DEBS/$pkgdata{$pkg}{arch}") {
+      mkdir "$topdir/DEBS/$pkgdata{$pkg}{arch}";
+    }
 
     # Skip building a package if it doesn't actually have any files.  NB:  This
@@ -871 +895 @@
         or die $!;
     print DEBSCRIPT $scriptletbase;
-    print DEBSCRIPT "fakeroot dpkg-deb -b $buildroot/$pkg $topdir/DEBS/i386/".
-        "$pkgdata{$pkg}{name}_$pkgdata{$pkg}{version}-$pkgdata{main}{release}_i386.deb\n";
+    print DEBSCRIPT "fakeroot dpkg-deb -b $buildroot/$pkg $topdir/DEBS/$pkgdata{$pkg}{arch}/".
+        "$pkgdata{$pkg}{name}_$pkgdata{$pkg}{version}-$pkgdata{main}{release}_$pkgdata{$pkg}{arch}.deb\n";
       # %$&$%@#@@#%@@@ Debian and their horrible ugly package names.  >:(
     close DEBSCRIPT;
@@ -880 +904 @@
         "Section: $pkgdata{$pkg}{group}\n".
         "Priority: optional\n".
-        "Architecture: i386\n".
+        "Architecture: $pkgdata{$pkg}{arch}\n".
         "Maintainer: $pkgdata{main}{packager}\n".
         ( $pkgdata{$pkg}{requires} ne '' ? "Depends: $pkgdata{$pkg}{requires}\n" : '' ).
@@ -942 +966 @@
 
     $finalmessages .= "Wrote binary package ".
-        "$pkgdata{$pkg}{name}_$pkgdata{$pkg}{version}-$pkgdata{main}{release}_i386.deb".
-        " in $topdir/DEBS/i386\n";
+        "$pkgdata{$pkg}{name}_$pkgdata{$pkg}{version}-$pkgdata{main}{release}_$pkgdata{$pkg}{arch}.deb".
+        " in $topdir/DEBS/$pkgdata{$pkg}{arch}\n";
     # and clean up
     unlink $debscriptfile;
@@ -1296 +1320 @@
       $macrostring =~ s|%{__([a-z0-9_-]+)}|$1|g;
     }
+
+    # Misc expansions
+    $macrostring =~ s|%{_arch}|$hostarch|g;
+    $macrostring =~ s|%{optflags}|$optflags{$hostarch}|g;
+
   } # done with globals section