diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2003-06-16 10:32:56 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2003-06-16 10:32:56 +0000 |
| commit | 34c1ee0eee4583ff59f3dee939be99fc60236105 (patch) | |
| tree | 28b7eb1275eefe78bdcc2767860d8e14f014ace8 | |
| parent | 2976dd775f065131cbd48b72be688656530bf53d (diff) | |
| download | perl-MDK-Common-34c1ee0eee4583ff59f3dee939be99fc60236105.tar perl-MDK-Common-34c1ee0eee4583ff59f3dee939be99fc60236105.tar.gz perl-MDK-Common-34c1ee0eee4583ff59f3dee939be99fc60236105.tar.bz2 perl-MDK-Common-34c1ee0eee4583ff59f3dee939be99fc60236105.tar.xz perl-MDK-Common-34c1ee0eee4583ff59f3dee939be99fc60236105.zip | |
no native perl_checker for x86_64, only bytecode
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | perl-MDK-Common.spec | 14 |
2 files changed, 13 insertions, 4 deletions
@@ -6,6 +6,7 @@ PREFIX = /usr BINDIR = $(PREFIX)/bin VENDORLIB = $(shell eval "`perl -V:installvendorlib`"; echo $$installvendorlib) INSTALLVENDORLIB = $(shell echo $(VENDORLIB) | sed 's,/usr,$(PREFIX),') +PERL_CHECKER_TARGET = native-code GENERATED = MDK/Common.pm index.html perl_checker.src/perl_checker @@ -20,7 +21,7 @@ MDK/Common.pm: %: %.pl perl $< > $@ perl_checker.src/perl_checker: - $(MAKE) -C perl_checker.src build_ml native-code VENDORLIB=$(VENDORLIB) + $(MAKE) -C perl_checker.src build_ml $(PERL_CHECKER_TARGET) VENDORLIB=$(VENDORLIB) test: perl_checker.src/perl_checker perl_checker.src/perl_checker MDK/Common/*.pm diff --git a/perl-MDK-Common.spec b/perl-MDK-Common.spec index 13b6498..b4d459a 100644 --- a/perl-MDK-Common.spec +++ b/perl-MDK-Common.spec @@ -2,7 +2,12 @@ # do not change the version here, change in MDK/Common.pm.pl %define version THEVERSION -%define release 1mdk +%define release 2mdk + +%ifarch x86_64 +%define build_option PERL_CHECKER_TARGET='debug-code BCSUFFIX=""' +%define require_ocaml /usr/bin/ocamlrun +%endif Summary: Various simple functions Name: perl-MDK-Common @@ -31,6 +36,7 @@ Summary: Various verifying scripts Group: Development/Perl AutoReqProv: 0 Requires: perl-base >= 2:5.8.0 +Requires: %{require_ocaml} %description Various simple functions created for DrakX @@ -42,11 +48,11 @@ Various verifying scripts created for DrakX %setup -n %{name} %build -make test +make test %build_option %install rm -rf $RPM_BUILD_ROOT -make install PREFIX="$RPM_BUILD_ROOT/usr" +make install PREFIX="$RPM_BUILD_ROOT/usr" %build_option %clean rm -rf $RPM_BUILD_ROOT @@ -64,6 +70,8 @@ rm -rf $RPM_BUILD_ROOT # MODIFY IN THE CVS: cvs.mandrakesoft.com:/cooker soft/perl-MDK-Common %changelog +* Mon Jun 16 2003 Pixel <pixel@mandrakesoft.com> 1.1.4-2mdk +- no native perl_checker for x86_64, only bytecode - build require ocaml >= 3.06 (thanks to Per Øyvind Karlsen) * Tue May 27 2003 Pixel <pixel@mandrakesoft.com> 1.1.4-1mdk |