[SCM] Debian packaging of libembperl-perl branch, master, updated. 2baa7e615f09fcbd06b84978a8ea35db745636df

[Florian Schlichting]

The following commit has been merged in the master branch:
commit 57805b5d43aaa0644ce22779ba241a3bacab80a1
Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
Date:   Tue Sep 25 21:34:18 2012 +0200

    simplify Makefile.PL.patch: FORCEMP1 is no longer relevant, Makefile.PL can find Apache headers etc itself

diff --git a/debian/patches/Makefile.PL.patch b/debian/patches/Makefile.PL.patch
index 97c8504..8cdf27f 100644
--- a/debian/patches/Makefile.PL.patch
+++ b/debian/patches/Makefile.PL.patch
@@ -1,10 +1,10 @@
 Description: 
  - remove extensions from scripts
- - <more>
+ - add the output of `apxs2 -q CFLAGS` to CCFLAGS
 
 --- a/Makefile.PL
 +++ b/Makefile.PL
-@@ -247,13 +247,15 @@
+@@ -247,8 +247,9 @@
              { # with Apache 2, make sure we have the same defines as mod_perl
              $txt =~ s/-O\d//g if ($ccdebug =~ /-O\d/) ;
              $txt =~ /CCFLAGS\s*=(.*?)\n/s ;
@@ -15,14 +15,7 @@ Description:
              }
          else
              {
-+            my $extra = "$Config{cppflags} " . Apache::src->new->ccflags ;
-             $txt =~ s/-O\d//g if ($ccdebug =~ /-O\d/) ;
--	    $txt =~ s/CCFLAGS\s*=/CCFLAGS = $ccdebug $addcflags/ ;
-+	    $txt =~ s/CCFLAGS\s*=/CCFLAGS = $ccdebug $addcflags $extra/ ;
-             }
- 
-         
-@@ -305,7 +307,14 @@
+@@ -305,7 +306,14 @@
           }
       }
  
@@ -38,7 +31,7 @@ Description:
       {
       foreach (keys %{$self->{$hash}})
           {
-@@ -318,6 +327,14 @@
+@@ -318,6 +326,14 @@
         $self -> MM::post_initialize (@_) ;
         }
  
@@ -75,76 +68,11 @@ Description:
      }
  
  ## ----------------------------------------------------------------------------
-@@ -547,26 +551,26 @@
-     $apache_src = '' if ($apache_src eq '-') ;
-     }
- 
--if (!$apache && $apache_src eq '')
-+if (1)
-     {
-     # check for mod_perl 2.0
--    eval 'use Apache2; use Apache::BuildConfig' ;
-+    eval 'use Apache2; use Apache::BuildConfig' unless $ENV{FORCEMP1};
- 
--    if ($@ eq '')
-+    if (!$ENV{FORCEMP1} and $@ eq '')
-         { 
-         $mp2cfg = Apache::BuildConfig -> new ;
--        $apache_src = $mp2cfg -> {MP_AP_PREFIX} || $mp2cfg -> {ap_includedir} ;
-+        $apache_src ||= $mp2cfg -> {MP_AP_PREFIX} || $mp2cfg -> {ap_includedir} ;
-         print "Found mod_perl 2.0\n" ;
-         }
-     else
- 	{
--        eval 'use Apache2::BuildConfig' ;
-+        eval 'use Apache2::BuildConfig' unless $ENV{FORCEMP1};
- 
--        if ($@ eq '')
-+        if (!$ENV{FORCEMP1} and $@ eq '')
-             { 
- 	    $mp2Apache2 = 1 ;
-             $mp2cfg = Apache2::BuildConfig -> new ;
--            $apache_src = $mp2cfg -> {MP_AP_PREFIX} || $mp2cfg -> {ap_includedir} ;
-+            $apache_src ||= $mp2cfg -> {MP_AP_PREFIX} || $mp2cfg -> {ap_includedir} ;
-             print "Found mod_perl 2.0\n" ;
- 	    }
- 	else
-@@ -575,11 +579,11 @@
- 
-             if ($@ eq '')
-                 { 
--                $apache_src = $Apache::MyConfig::Setup{Apache_Src} ; 
-+                $apache_src ||= $Apache::MyConfig::Setup{Apache_Src} ;
-                 }
-             else
-                 {
--                $apache_src = '' ;
-+                $apache_src ||= '' ;
-                 }
- 	    }
-         }
-@@ -787,7 +791,10 @@
-     $i = '' ;
-     $o = '' ;
-     }
--		
-+
-+if ($mp2cfg) {
-+  $i .= " -I$mp2cfg->{apr_includedir}" if $mp2cfg->{apr_includedir};
-+}		
- 
- if ($win32 && $apache)
-     {	# borrowed from mod_perl
-@@ -1337,10 +1344,11 @@
+@@ -1337,6 +1341,7 @@
      'INC'	   => "-I$EPPATH $i",     			 
      'VERSION'      => undef,
      'VERSION_FROM' => "$EPPATH/Embperl.pm",
-+    'CCFLAGS'      => $Config{cppflags}.($mp2cfg?`apxs2 -q CFLAGS`:Apache::src->new->ccflags),
++    'CCFLAGS'      => $Config{cppflags}.`apxs2 -q CFLAGS`,
      $optdebug?('OPTIMIZE' => $ccdebug):(),
      ) ;
  
--
-+$i = "-I$EPPATH $i";
- 
- open FH, ">xs/mmargs.pl" or die "Cannot open xs/mmargs.pl ($!).\n
- --------------------------------------------------------------------------
diff --git a/debian/rules b/debian/rules
index 48a43ba..46d796e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,26 +29,16 @@ else
 OPTIMIZE += -O2
 endif
 
-APXS=apxs2
-
 POD2TEXT = Changes Config Faq Features FeaturesD \
    Intro IntroEmbperlObject SVN TipsAndTricks
 
-APACHE_HDR=$(shell $(APXS) -q INCLUDEDIR)
-APACHE_SRC=$(shell $(APXS) -q LIBEXECDIR)
-EPHTTPD=$(shell $(APXS) -q SBINDIR)/$(shell $(APXS) -q TARGET)
-
 %: %.pod
 	pod2text < $< > $@
 
 config: config-stamp
 config-stamp: $(QUILT_STAMPFN)
-	FORCEMP=0
 	dh_testdir
-	APACHE_HDR=$(APACHE_HDR) \
-	APACHE_SRC=$(APACHE_SRC) \
-	EPHTTPD=$(EPHTTPD) \
-	FORCEMP1=$(FORCEMP) \
+	EPHTTPD=/usr/sbin/apache2 \
 	$(PERL) Makefile.PL $(DEBUG) INSTALLDIRS=vendor
 	touch $@
 

-- 
Debian packaging of libembperl-perl