SF.net SVN: gar:[22810] csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile

[lblume at users.sourceforge.net]

Revision: 22810
          http://sourceforge.net/p/gar/code/22810
Author:   lblume
Date:     2014-01-09 14:10:29 +0000 (Thu, 09 Jan 2014)
Log Message:
-----------
mysql5/branches/mysql-5.5.x: mysql_config should not be isaexec; remove compiler parameters from it

Modified Paths:
--------------
    csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile

Modified: csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile
===================================================================
--- csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2014-01-09 12:55:36 UTC (rev 22809)
+++ csw/mgar/pkg/mysql5/branches/mysql-5.5.x/Makefile	2014-01-09 14:10:29 UTC (rev 22810)
@@ -93,6 +93,7 @@
 # The daemon to launch is selected by script, should not be automatic
 # Some other files too should probably not be isaexec'd
 EXTRA_ISAEXEC_EXCLUDE_FILES  = /opt/csw/libexec/mysqld
+EXTRA_ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/mysql_config
 EXTRA_ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/mysqld_safe
 EXTRA_ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/mysqld_multi
 EXTRA_ISAEXEC_EXCLUDE_FILES += /opt/csw/bin/my_print_defaults
@@ -394,6 +395,27 @@
 				$(DESTDIR)$(bindir)/$$file; \
 		done; \
 	fi
+
+	# Remove compiler-specific parameters
+	gsed -i \
+		-e '/^[^#]/s/-xO[0-5][^ ]* *//g' \
+		-e '/^[^#]/s/-xarch=[^ ]* *//g' \
+		-e '/^[^#]/s/-xchip=[^ ]* *//g' \
+		-e '/^[^#]/s/-norunpath[^ ]* *//g' \
+		-e '/^[^#]/s/-lCrun[^ ]* *//g' \
+		-e '/^[^#]/s/-lCstd[^ ]* *//g' \
+		-e '/^[^#]/s/-mtune=[^ ]* *//g' \
+		-e '/^[^#]/s/-march=[^ ]* *//g' \
+		-e '/^[^#]/s/-Wall *//g' \
+		-e '/^[^#]/s/-pipe *//g' \
+		-e '/^[^#]/s/-KPIC/-fPIC/g' \
+		-e '/^[^#]/s/-mno-app-regs//g' \
+		-e '/^[^#]/s/-fno-omit-frame-pointer//g' \
+		-e '/^[^#]/s/-fno-strict-aliasing//g' \
+		-e '/^[^#]/s/-Wa,-xarch=[^ ]*//g' \
+		-e '/^[^#]/s/-static-libgcc//g' \
+		$(DESTDIR)$(bindir)/mysql_config
+
 	@$(MAKECOOKIE)
 
 post-merge:

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.