Bug 1031 - cygwin patch
Summary: cygwin patch
Status: RESOLVED FIXED
Alias: None
Product: Spamassassin
Classification: Unclassified
Component: Building & Packaging (show other bugs)
Version: 2.41
Hardware: PC All
: P2 normal
Target Milestone: ---
Assignee: SpamAssassin Developer Mailing List
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2002-09-26 08:47 UTC by Reini Urban
Modified: 2002-10-03 05:10 UTC (History)
0 users


Attachment Type Modified Status Actions Submitter/CLA Status
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Reini Urban 2002-09-26 08:47:32 UTC 
Adds EXE extension for a succesfull cygwin build

$ diff -bu Mail-SpamAssassin-2.41/Makefile.Pl~ Mail-SpamAssassin-2.41/Makefile.
--- Mail-SpamAssassin-2.41/Makefile.Pl~ 2002-09-05 12:55:57.000000000 +0000
+++ Mail-SpamAssassin-2.41/Makefile.PL  2002-09-26 15:39:50.000000000 +0000
@@ -36,8 +36,8 @@
     'NAME'     => 'Mail::SpamAssassin',
     'VERSION_FROM' => 'lib/Mail/SpamAssassin.pm', # finds $VERSION

-    'EXE_FILES'        => [ 'spamassassin', 'spamd/spamc',
-               'spamd/spamd', ],
+    'EXE_FILES'        => [ 'spamassassin$(EXE_EXT)', 'spamd/spamc$(EXE_EXT)',
+                    'spamd/spamd$(EXE_EXT)', ],

     'MAN1PODS' => {
            'spamassassin' => '$(INST_MAN1DIR)/spamassassin.$(MAN1EXT)',
@@ -112,18 +112,18 @@

 pm_to_blib: spamassassin doc/.made

-spamassassin: spamassassin.raw
+spamassassin$(EXE_EXT): spamassassin.raw
        $(PERL) fixpath.pl $(FIXPATHFLAGS) spamassassin.raw $@
        $(CHMOD) $(PERM_RWX) $@

-spamd/spamd: spamd/spamd.raw
+spamd/spamd$(EXE_EXT): spamd/spamd.raw
        $(PERL) fixpath.pl $(FIXPATHFLAGS) spamd/spamd.raw $@
        $(CHMOD) $(PERM_RWX) $@

 spamd/libspamc.so: binaries.mk
        $(MAKE) -f binaries.mk $@

-spamd/spamc: binaries.mk
+spamd/spamc$(EXE_EXT): binaries.mk
        $(MAKE) -f binaries.mk $@

 binaries.mk: configure

--- Mail-SpamAssassin-2.41/binaries.mk.in~      2002-09-02 17:48:10.000000000 +0000
+++ Mail-SpamAssassin-2.41/binaries.mk.in       2002-09-26 15:38:34.000000000 +0000
@@ -11,7 +11,7 @@

 LIBSPAMC_FILES = spamd/libspamc.c spamd/utils.c

-spamd/spamc: $(SPAMC_FILES) $(LIBSPAMC_FILES)
+spamd/spamc$(EXE_EXT): $(SPAMC_FILES) $(LIBSPAMC_FILES)
        $(CC) $(CFLAGS) $(SPAMC_FILES) $(LIBSPAMC_FILES) \
                -o $@ $(LDFLAGS) $(LIBS)
Comment 1 Justin Mason 2002-10-01 14:03:23 UTC 
Reini --

does Cygwin predefine EXE_EXT?  how does it get used by the Makefile.PL-
generated Makefile, since it's not *set* in that patch?
Comment 2 Reini Urban 2002-10-02 02:47:01 UTC 
Subject: Re:  cygwin patch

bugzilla-daemon@hughes-family.org schrieb:
> http://www.hughes-family.org/bugzilla/show_bug.cgi?id=1031
> 
> jm@jmason.org changed:
> 
>            What    |Removed                     |Added
> ----------------------------------------------------------------------------
>              Status|NEW                         |ASSIGNED
> 
> 
> 
> ------- Additional Comments From jm@jmason.org  2002-10-01 14:03 -------
> Reini --
> 
> does Cygwin predefine EXE_EXT?  how does it get used by the Makefile.PL-
> generated Makefile, since it's not *set* in that patch?


Oops. I forgot my password.

Perl sets this var. I verified the patch.
ExtUtils::MakeMaker sets it correctly:

     # we will use all these variables in the Makefile
     @Get_from_Config =
	qw(
	   ar cc cccdlflags ccdlflags dlext dlsrc ld lddlflags ldflags libc
	   lib_ext obj_ext osname osvers ranlib sitelibexp sitearchexp so
	   exe_ext full_ar
	  );
Comment 3 Reini Urban 2002-10-02 02:49:10 UTC 
Perl sets this var. I verified the patch.
ExtUtils::MakeMaker sets it correctly:

    # we will use all these variables in the Makefile
    @Get_from_Config =
    qw(
       ar cc cccdlflags ccdlflags dlext dlsrc ld lddlflags ldflags libc
       lib_ext obj_ext osname osvers ranlib sitelibexp sitearchexp so
       exe_ext full_ar
      );
Comment 4 Justin Mason 2002-10-02 03:53:27 UTC 
OK, another query.  spamc needs the EXE_EXT to become spamc.exe.
But spamd and spamassassin should not, to my mind; do they still work
OK with the .exe extension?

Last question, I promise ;)
Comment 5 Reini Urban 2002-10-02 09:43:29 UTC 
Oops, my mistake sorry.
Please remove EXE_EXT from spamd and spamassassin.

Only for the windows binaries.
Comment 6 Justin Mason 2002-10-03 13:10:25 UTC 
ok, now checked in. thanks!