Attachment 145063 Details for Bug 192177 – alternate patch that runs protoc-c to update the .c and .h files

[patch] alternate patch that runs protoc-c to update the .c and .h files

umurmur.patch2 (text/plain), 3.11 KB, created by Don Lewis on 2014-07-28 07:52:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Don Lewis

Created: 2014-07-28 07:52:57 UTC

Size: 3.11 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 362173)
>+++ Makefile	(working copy)
>@@ -28,6 +28,9 @@
> 	@${REINPLACE_CMD} \
> 		-e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/umurmur.conf.example
> 
>+pre-build:
>+	${PREFIX}/bin/protoc-c -I${WRKSRC}/src --c_out=${WRKSRC}/src ${WRKSRC}/src/Mumble.proto
>+
> post-install:
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/umurmur
> 	${INSTALL_DATA} ${WRKSRC}/umurmur.conf.example ${STAGEDIR}${PREFIX}/etc/umurmur/umurmur.conf.sample
>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(revision 0)
>+++ files/patch-configure	(working copy)
>@@ -0,0 +1,54 @@
>+--- configure.orig	2013-06-09 11:59:19.000000000 -0700
>++++ configure	2014-07-27 14:46:31.000000000 -0700
>+@@ -4233,9 +4233,9 @@
>+ 
>+ done
>+ 
>+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for protobuf_c_data_buffer_init in -lprotobuf-c" >&5
>+-$as_echo_n "checking for protobuf_c_data_buffer_init in -lprotobuf-c... " >&6; }
>+-if ${ac_cv_lib_protobuf_c_protobuf_c_data_buffer_init+:} false; then :
>++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for protobuf_c_version_number in -lprotobuf-c" >&5
>++$as_echo_n "checking for protobuf_c_version_number in -lprotobuf-c... " >&6; }
>++if ${ac_cv_lib_protobuf_c_version_number+:} false; then :
>+   $as_echo_n "(cached) " >&6
>+ else
>+   ac_check_lib_save_LIBS=$LIBS
>+@@ -4246,30 +4246,31 @@
>+ /* Override any GCC internal prototype to avoid an error.
>+    Use char because int might match the return type of a GCC
>+    builtin and then its argument prototype would still apply.  */
>++#include <stdint.h>
>+ #ifdef __cplusplus
>+ extern "C"
>+ #endif
>+-char protobuf_c_data_buffer_init ();
>++uint32_t protobuf_c_version_number ();
>+ int
>+ main ()
>+ {
>+-return protobuf_c_data_buffer_init ();
>++return protobuf_c_version_number () == 0;
>+   ;
>+   return 0;
>+ }
>+ _ACEOF
>+ if ac_fn_c_try_link "$LINENO"; then :
>+-  ac_cv_lib_protobuf_c_protobuf_c_data_buffer_init=yes
>++  ac_cv_lib_protobuf_c_version_number=yes
>+ else
>+-  ac_cv_lib_protobuf_c_protobuf_c_data_buffer_init=no
>++  ac_cv_lib_protobuf_c_version_number=no
>+ fi
>+ rm -f core conftest.err conftest.$ac_objext \
>+     conftest$ac_exeext conftest.$ac_ext
>+ LIBS=$ac_check_lib_save_LIBS
>+ fi
>+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_protobuf_c_protobuf_c_data_buffer_init" >&5
>+-$as_echo "$ac_cv_lib_protobuf_c_protobuf_c_data_buffer_init" >&6; }
>+-if test "x$ac_cv_lib_protobuf_c_protobuf_c_data_buffer_init" = xyes; then :
>++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_protobuf_c_version_number" >&5
>++$as_echo "$ac_cv_lib_protobuf_c_version_number" >&6; }
>++if test "x$ac_cv_lib_protobuf_c_version_number" = xyes; then :
>+   cat >>confdefs.h <<_ACEOF
>+ #define HAVE_LIBPROTOBUF_C 1
>+ _ACEOF
>
>Property changes on: files/patch-configure
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 192177: 145052 | 145053 | 145054 | 145061 | 145063 | 145804