r56259 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r56258‎ | r56259 | r56260 >
Date:13:00, 13 September 2009
Author:midom
Status:ok
Tags:
Comment:
* --with-cdb
* -O3 instead of -O2
* Removed stripping
* -ggdb3 for full GDB satisfaction
Modified paths:
  • /trunk/debs/php5/debian/rules (modified) (history)

Diff [purge]

Index: trunk/debs/php5/debian/rules
@@ -32,7 +32,7 @@
3333
3434
3535 PROG_SENDMAIL = /usr/sbin/sendmail
36 -CFLAGS = -O2 -Wall -fsigned-char -fno-strict-aliasing
 36+CFLAGS = -O3 -Wall -fsigned-char -fno-strict-aliasing -ggdb3
3737 # LFS support
3838 ifneq (yes,$(PHP5_COMPAT))
3939 CFLAGS += $(shell getconf LFS_CFLAGS)
@@ -43,16 +43,6 @@
4444 CFLAGS += -mieee
4545 endif
4646
47 -ifeq ($(PHP5_HOST_GNU_TYPE), $(findstring $(PHP5_HOST_GNU_TYPE), ia64-linux powerpc64-linux))
48 - CFLAGS += -g
49 -else
50 - CFLAGS += -gstabs
51 -endif
52 -
53 -ifneq (nostrip, $(findstring nostrip, $(DEB_BUILD_OPTIONS)))
54 - install_strip = -s
55 -endif
56 -
5747 # Old magic.mime location:
5848 ifeq ($(wildcard /usr/share/misc/file/magic.mime), /usr/share/misc/file/magic.mime)
5949 MAGIC_MIME = /usr/share/misc/file/magic.mime
@@ -103,7 +93,8 @@
10494 --enable-zip \
10595 --with-mime-magic=$(MAGIC_MIME) \
10696 --with-exec-dir=/usr/lib/php5/libexec \
107 - --with-system-tzdata
 97+ --with-system-tzdata \
 98+ --with-cdb
10899
109100 BUILTIN_EXTENSION_CHECK=$$e=get_loaded_extensions(); natcasesort($$e); \
110101 $$s="The following extensions are built in:"; \
@@ -352,7 +343,7 @@
353344 mkdir -p debian/php5-$$package$${ext}; \
354345 chrpath debian/libapache2-mod-php5/$${ext}/$$dsoname.so; \
355346 chrpath -d debian/libapache2-mod-php5/$${ext}/$$dsoname.so; \
356 - install ${install_strip} -m 644 -o root -g root \
 347+ install -m 644 -o root -g root \
357348 debian/libapache2-mod-php5/$${ext}/$$dsoname.so \
358349 debian/php5-$$package$${ext}/$$dsoname.so; \
359350 rm debian/libapache2-mod-php5/$${ext}/$$dsoname.so; \
@@ -476,7 +467,6 @@
477468 done
478469 dh_installcron -pphp5-common --name=php5
479470 dh_installchangelogs -pphp5-common NEWS
480 - dh_strip -s
481471 dh_link -s
482472 dh_compress -s -Xphp.ini
483473 dh_fixperms -s -X /var/lib/php5

Status & tagging log