~drizzle-developers/pkg-drizzle/drizzle7-dev.rpm

« back to all changes in this revision

Viewing changes to SOURCES/drizzle-2010.06.1607-protobuf.patch

  • Committer: hingo
  • Date: 2012-01-02 18:59:54 UTC
  • Revision ID: hingo@drizzle-centos6-20120102185954-gll5xua11krlejfc
* Sun Jan 01 2012 Henrik Ingo <henrik.ingo@avoinelama.fi> - 2011.11.29.2481-2
- Hrmpf... server doesn't actually start:
-  --user can only be given in cmd line (ie init script), not in
   drizzled.cnf.
- Turns out --user and --daemon don't work well together, so have to use
  sudo -u drizzle /usr/sbin/drizzled --daemon instead.
- Remove 2>&1 so that errors are shown to user. Currently all auth and
  policy plugins will break drizzled due to installing broken stuff into
  /etc/drizzle/conf.d/ so let's at least not silently fail.
- Other:
- Don't package hello_events plugin, it's just an example.
- Don't build with --enable-profiling. (LP#770420)
- Realize I must package js with server, not in a separate rpm.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
Resolves protobuf issue on Fedora 13, reported upstream at:
2
 
 
3
 
https://bugs.launchpad.net/drizzle/+bug/591960
4
 
 
5
 
--- drizzle-2010.06.1607/drizzled/include.am.orig       2010-06-08 13:23:28.000000000 -0500
6
 
+++ drizzle-2010.06.1607/drizzled/include.am    2010-06-09 17:16:02.893210229 -0500
7
 
@@ -456,7 +456,8 @@
8
 
                                $(LIBDL_LIBS) \
9
 
                                $(LIBPCRE) \
10
 
                                $(LIBTBB) \
11
 
-                               $(GCOV_LIBS) 
12
 
+                               $(GCOV_LIBS) \
13
 
+                               ${LTLIBPROTOBUF} 
14
 
 
15
 
 drizzled_drizzled_DEPENDENCIES= \
16
 
                                       drizzled/message/libdrizzledmessage.la \