Skip to content

Commit

Permalink
Started to throw out the following things:
Browse files Browse the repository at this point in the history
- PPC Support
- Oracle Support
- pdflib Support
  • Loading branch information
ebi committed Jul 15, 2009
1 parent 189a6ee commit 28adc6b
Show file tree
Hide file tree
Showing 22 changed files with 12 additions and 501 deletions.
17 changes: 0 additions & 17 deletions build-php.pl
Expand Up @@ -23,7 +23,6 @@
basedir => $basedir,
prefix => '/usr/local/php5',
orahome => "$basedir/install",
pdflib_lite => 1,
mysql_install_prefix => undef,
variants => {
apache1 => {
Expand All @@ -43,26 +42,10 @@
# my $php5 = Package::php5->new(config => $config, variant => 'apache2');
# $php5->create_distimage();

#use Package::pdflib_commercial;
#my $pdflib = Package::pdflib_commercial->new(config => $config, variant => 'apache2');
#$pdflib->prepackage_hook($config->prefix());

my $php = Package::php5->new(config => $config, variant => 'apache2');
$php->create_distimage();
# $php->install();



# use Package::pdflib;
# my $p = Package::pdflib->new(config => $config, variant => 'apache2');
# $p->install();


# use Package::pdflib_commercial;
# my $p = Package::pdflib_commercial->new(config => $config, variant => 'apache2');
# $p->download();


# use Package::mssql;
# my $p = Package::mssql->new(config => $config, variant => 'apache2');
# $p->install();
Expand Down
4 changes: 2 additions & 2 deletions build-php.sh 100644 → 100755
@@ -1,4 +1,4 @@
#!/bin/sh

sudo rm -rf /tmp/build-entropy-php-pkg/php5/ /tmp/build-entropy-php-pkgdst/entropy-php.pkg src/php-5.*/ /usr/local/php5/libphp5.so
sudo nice -n 19 perl -Ilib build-php.pl
rm -rf /tmp/build-entropy-php-pkg/php5/ /tmp/build-entropy-php-pkgdst/entropy-php.pkg src/php-5.*/ /usr/local/php5/libphp5.so
nice -n 19 perl -Ilib build-php.pl
15 changes: 0 additions & 15 deletions extras/oracleinstantclient/package/resources/InstallationCheck

This file was deleted.

Binary file removed extras/pdflib/pdflib-2.1.2.tgz
Binary file not shown.
Binary file removed extras/pdflib/pdflib-2.1.5.tgz
Binary file not shown.
13 changes: 0 additions & 13 deletions extras/pdflib/pdflib-7.0.2.uint32-conflict.patch

This file was deleted.

10 changes: 1 addition & 9 deletions extras/php5/php-entropy.patch
@@ -1,7 +1,7 @@
diff -ru php-5.2.4/ext/standard/info.c php-5.2.4.entropy/ext/standard/info.c
--- php-5.2.4/ext/standard/info.c 2007-07-21 03:24:26.000000000 +0200
+++ php-5.2.4.entropy/ext/standard/info.c 2007-11-02 00:39:21.000000000 +0100
@@ -454,6 +454,23 @@
@@ -454,6 +454,15 @@

if (!sapi_module.phpinfo_as_text) {
php_printf("<h1 class=\"p\">PHP Version %s</h1>\n", PHP_VERSION);
Expand All @@ -12,14 +12,6 @@ diff -ru php-5.2.4/ext/standard/info.c php-5.2.4.entropy/ext/standard/info.c
+#ifdef __x86_64__
+#define ENTROPY_CH_THIS_ARCH "x86_64"
+#endif
+
+#ifdef __ppc__
+#define ENTROPY_CH_THIS_ARCH "ppc"
+#endif
+
+#ifdef __ppc64__
+#define ENTROPY_CH_THIS_ARCH "ppc64"
+#endif
+ php_printf("<h2 class=\"p\"><a style=\"text-decoration: none; background-color:inherit;\" href='http://www.entropy.ch/software/macosx/php/?phpinfo-version=%s-%d'>www.entropy.ch</a> Release %d</h2>\n", PHP_VERSION, ENTROPY_CH_RELEASE, ENTROPY_CH_RELEASE);
+ php_printf("<p>Universal Binary %s - this machine runs: %s</p>\n", ENTROPY_CH_ARCHS, ENTROPY_CH_THIS_ARCH);
} else {
Expand Down
21 changes: 0 additions & 21 deletions extras/php5/php-mysqlnd-ppc64.patch

This file was deleted.

2 changes: 1 addition & 1 deletion lib/Package/curl.pm
Expand Up @@ -27,7 +27,7 @@ sub subpath_for_check {
}


#CFLAGS='-arch i386 -arch x86_64 -arch ppc7400 -arch ppc64' LDFLAGS='-arch i386 -arch x86_64 -arch ppc7400 -arch ppc64' CC='cc -DENTROPY_CH_RELEASE=2' ./configure --disable-dependency-tracking --prefix=/usr/local/php5 --enable-ldaps
#CFLAGS='-arch i386 -arch x86_64' LDFLAGS='-arch i386 -arch x86_64' CC='cc -DENTROPY_CH_RELEASE=2' ./configure --disable-dependency-tracking --prefix=/usr/local/php5 --enable-ldaps

sub configure_flags {
my $self = shift @_;
Expand Down
2 changes: 1 addition & 1 deletion lib/Package/gettext.pm
Expand Up @@ -43,7 +43,7 @@ sub php_extension_configure_flags {
}


#CFLAGS='-arch i386 -arch x86_64 -arch ppc7400 -arch ppc64' LDFLAGS='-arch i386 -arch x86_64 -arch ppc7400 -arch ppc64' CC='cc -DENTROPY_CH_RELEASE=2' ./configure --with-libiconv-prefix=/usr/local/php5 --without-emacs --disable-java --disable-native-java --disable-dependency-tracking --prefix=/usr/local/php5
#CFLAGS='-arch i386 -arch x86_64' LDFLAGS='-arch i386 -arch x86_64' CC='cc -DENTROPY_CH_RELEASE=2' ./configure --with-libiconv-prefix=/usr/local/php5 --without-emacs --disable-java --disable-native-java --disable-dependency-tracking --prefix=/usr/local/php5

sub configure_flags {
my $self = shift @_;
Expand Down
2 changes: 1 addition & 1 deletion lib/Package/libjpeg.pm
Expand Up @@ -32,7 +32,7 @@ sub filename {
# return undef unless ($self->SUPER::build(@_));
# my $prefix = $self->config()->prefix();
# $self->cd_packagesrcdir();
# $self->shell(qq!CFLAGS="-arch ppc -arch i386" ./configure ! . $self->configure_flags());
# $self->shell(qq!CFLAGS="-arch i386" ./configure ! . $self->configure_flags());
# $self->shell($self->make_command());
#
# }
Expand Down
174 changes: 0 additions & 174 deletions lib/Package/oracleinstantclient.pm

This file was deleted.

0 comments on commit 28adc6b

Please sign in to comment.