gistfile1.diff

--- /var/lib/mock/fedora-rawhide-x86_64/root/builddir/build/BUILD/mysql-ruby-2.8.2/Makefile
+++ /var/lib/mock/fedora-18-x86_64/root/builddir/build/BUILD/mysql-ruby-2.8.2/Makefile
@@ -5,41 +5,26 @@
 V = 1
 Q1 = $(V:1=)
 Q = $(Q1:0=@)
-ECHO1 = $(V:1=@:)
+n=$(NULLCMD)
+ECHO1 = $(V:1=@$n)
 ECHO = $(ECHO1:0=@echo)
 
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = $(DESTDIR)/usr/include
-hdrdir = $(DESTDIR)/usr/include
-arch_hdrdir = $(rubyhdrdir)/$(arch)
-PATH_SEPARATOR = :
+topdir = /usr/include
+hdrdir = /usr/include
+arch_hdrdir = /usr/include/$(arch)
 VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
-prefix = $(DESTDIR)
-rubysitearchprefix = $(rubylibprefix)/$(sitearch)
-rubyarchprefix = $(rubylibprefix)/$(arch)
-rubylibprefix = $(exec_prefix)/share/$(RUBY_BASE_NAME)
-exec_prefix = $(prefix)
-vendorarchhdrdir = $(vendorhdrdir)/$(sitearch)
-sitearchhdrdir = $(sitehdrdir)/$(sitearch)
-rubyarchhdrdir = $(rubyhdrdir)/$(arch)
+prefix = $(DESTDIR)/usr
+rubylibprefix = $(DESTDIR)/usr/share/ruby
+exec_prefix = $(DESTDIR)/usr
 vendorhdrdir = $(rubyhdrdir)/vendor_ruby
 sitehdrdir = $(rubyhdrdir)/site_ruby
 rubyhdrdir = $(DESTDIR)/usr/include
 rubygemsdir = $(DESTDIR)/usr/share/rubygems
-vendorarchdir = $(DESTDIR)/usr/lib64/ruby/vendor_ruby
-vendorlibdir = $(vendordir)/$(ruby_version)
 vendordir = $(DESTDIR)/usr/share/ruby/vendor_ruby
-sitearchdir = $(DESTDIR)/usr/local/lib64/ruby/site_ruby
-sitelibdir = $(sitedir)/$(ruby_version)
 sitedir = $(DESTDIR)/usr/local/share/ruby/site_ruby
-rubyarchdir = $(DESTDIR)/usr/lib64/ruby
-rubylibdir = $(rubylibprefix)/$(ruby_version)
-sitearchincludedir = $(includedir)/$(sitearch)
-archincludedir = $(includedir)/$(arch)
-sitearchlibdir = $(libdir)/$(sitearch)
-archlibdir = $(libdir)/$(arch)
 ridir = $(datarootdir)/$(RI_BASE_NAME)
 mandir = $(DESTDIR)/usr/share/man
 localedir = $(datarootdir)/locale
@@ -60,8 +45,14 @@
 libexecdir = $(DESTDIR)/usr/libexec
 sbindir = $(DESTDIR)/usr/sbin
 bindir = $(DESTDIR)/usr/bin
-archdir = $(rubyarchdir)
-
+rubylibdir = $(rubylibprefix)
+archdir = $(DESTDIR)/usr/lib64/ruby
+sitelibdir = $(sitedir)
+sitearchdir = $(DESTDIR)/usr/local/lib64/ruby/site_ruby
+vendorlibdir = $(vendordir)
+vendorarchdir = $(DESTDIR)/usr/lib64/ruby/vendor_ruby
+
+NULLCMD = :
 
 CC = gcc
 CXX = g++
@@ -75,16 +66,16 @@
 
 RUBY_EXTCONF_H = 
 cflags   =  $(optflags) $(debugflags) $(warnflags)
-optflags = -O3 -fno-fast-math
-debugflags = -ggdb3
-warnflags = -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wunused-variable -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wimplicit-function-declaration
+optflags = -O3
+debugflags = -ggdb
+warnflags = -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wimplicit-function-declaration
 CFLAGS   = -fPIC -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -mtune=generic -fPIC $(ARCH_FLAG)
 INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
 DEFS     = 
-CPPFLAGS = -DHAVE_MYSQL_SSL_SET -DHAVE_RB_STR_SET_LEN -DHAVE_MYSQL_H  $(DEFS) $(cppflags) -I/usr/include/mysql -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4  -m64 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -fPIC  -g -static-libgcc -fno-omit-frame-pointer -fno-strict-aliasing -DMY_PTHREAD_FASTMUTEX=1
+CPPFLAGS = -DHAVE_MYSQL_SSL_SET -DHAVE_RB_STR_SET_LEN -DHAVE_MYSQL_H  $(DEFS) $(cppflags) -I/usr/include/mysql -g -pipe -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4  -m64 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -fno-strict-aliasing -fwrapv -fPIC  -fPIC -g -static-libgcc -fno-omit-frame-pointer -fno-strict-aliasing -DMY_PTHREAD_FASTMUTEX=1
 CXXFLAGS = $(CFLAGS) -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -mtune=generic
-ldflags  = -L. -Wl,-z,relro -fstack-protector -rdynamic -Wl,-export-dynamic
-dldflags =  
+ldflags  = -L. -Wl,-z,relro -rdynamic -Wl,-export-dynamic
+dldflags = 
 ARCH_FLAG = -m64
 DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
 LDSHARED = $(CC) -shared
@@ -92,20 +83,14 @@
 AR = ar
 EXEEXT = 
 
+RUBY_BASE_NAME = ruby
 RUBY_INSTALL_NAME = ruby
 RUBY_SO_NAME = ruby
-RUBYW_INSTALL_NAME = 
-RUBY_VERSION_NAME = $(RUBY_BASE_NAME)-$(ruby_version)
-RUBYW_BASE_NAME = rubyw
-RUBY_BASE_NAME = ruby
-
 arch = x86_64-linux
 sitearch = $(arch)
-ruby_version = 
-ruby = $(bindir)/ruby
+ruby_version = 1.9.1
+ruby = /usr/bin/ruby
 RUBY = $(ruby)
-ruby_headers = $(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h $(arch_hdrdir)/ruby/config.h
-
 RM = rm -f
 RM_RF = $(RUBY) -run -e rm -- -rf
 RMDIRS = rmdir --ignore-fail-on-non-empty -p
@@ -132,14 +117,10 @@
 extout_prefix = 
 target_prefix = 
 LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED) -L/usr/lib64/mysql -lmysqlclient -lpthread -lz -lm -lssl -lcrypto -ldl  -lpthread -lrt -ldl -lcrypt -lm   -lc
-ORIG_SRCS = mysql.c
-SRCS = $(ORIG_SRCS) 
+LIBS = $(LIBRUBYARG_SHARED) -L/usr/lib64/mysql -lmysqlclient -lpthread -lz -lm -lrt -lssl -lcrypto -ldl  -lpthread -lrt -ldl -lcrypt -lm   -lc
+SRCS = mysql.c
 OBJS = mysql.o
-HDRS = $(srcdir)/error_const.h
 TARGET = mysql
-TARGET_NAME = mysql
-TARGET_ENTRY = Init_$(TARGET_NAME)
 DLLIB = $(TARGET).so
 EXTSTATIC = 
 STATIC_LIB = 
@@ -158,7 +139,7 @@
 all:    $(DLLIB)
 static: $(STATIC_LIB)
 .PHONY: all install static install-so install-rb
-.PHONY: clean clean-so clean-static clean-rb
+.PHONY: clean clean-so clean-rb
 
 clean-static::
 clean-rb-default::
@@ -170,17 +151,18 @@
 distclean-rb-default::
 distclean-rb::
 distclean-so::
-distclean-static::
-distclean: clean distclean-so distclean-static distclean-rb-default distclean-rb
-		-$(Q)$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
-		-$(Q)$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
-		-$(Q)$(RMDIRS) $(DISTCLEANDIRS) 2> /dev/null || true
+distclean: clean distclean-so distclean-rb-default distclean-rb
+		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
+		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
+		@-$(RMDIRS) $(DISTCLEANDIRS) 2> /dev/null || true
 
 realclean: distclean
 install: install-so install-rb
 
-install-so: $(DLLIB) ./.RUBYARCHDIR.time
-	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
+install-so: $(RUBYARCHDIR)/$(DLLIB)
+$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
+	-$(Q)$(MAKEDIRS) $(@D)
+	$(INSTALL_PROG) $(DLLIB) $(@D)
 clean-static::
 	-$(Q)$(RM) $(STATIC_LIB)
 install-rb: pre-install-rb install-rb-default
@@ -234,4 +216,4 @@
 
 
 
-$(OBJS): $(HDRS) $(ruby_headers)
+$(OBJS): $(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h $(arch_hdrdir)/ruby/config.h