Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Thanks to Michele Martone <michelemartone@users.sourceforge.net> for the patch.
- Loading branch information
Stephen Montgomery-Smith
authored and
Stephen Montgomery-Smith
committed
Feb 1, 2022
1 parent
a318fc3
commit 234c241
Showing
4 changed files
with
127 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| TIMESTAMP = 1642804756 | ||
| SHA256 (librsb-1.2.0.11.tar.gz) = 0686be29bbe277e227c6021de6bd0564e4fc83f996b787886437d28048057bc8 | ||
| SIZE (librsb-1.2.0.11.tar.gz) = 2396146 | ||
| TIMESTAMP = 1643682194 | ||
| SHA256 (librsb-1.3.0.0.tar.gz) = 2ac8725d1f988f57df9383ae6b0bb2ed221ec935187d31ebb62ea95ee868a790 | ||
| SIZE (librsb-1.3.0.0.tar.gz) = 4302867 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| --- rsblib/configure.orig 2022-02-01 02:31:47 UTC | ||
| +++ rsblib/configure | ||
| @@ -16350,7 +16350,7 @@ if test x"$want_rsblib" != x"no" ; then | ||
| LIBRSB_LOCAL_LIBS="${BPWD}/librsb.la"; | ||
| { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming building as subdir of librsb, and that librsb will be built later." >&5 | ||
| $as_echo "$as_me: Assuming building as subdir of librsb, and that librsb will be built later." >&6;} | ||
| - CPPFLAGS+=" -I${BPWD}" | ||
| + CPPFLAGS="${CPPFLAGS} -I${BPWD}" | ||
| ac_cv_func_rsb_lib_init="yes"; | ||
| else | ||
|
|
||
| @@ -16438,9 +16438,9 @@ fi | ||
| $as_echo "$as_me: Where is librsb-config ?" >&6;}; | ||
| else | ||
| want_rsblib=yes; | ||
| - CPPFLAGS+=" ` $LIBRSB_CONFIG --I_opts`" | ||
| - LDFLAGS+=" `$LIBRSB_CONFIG --ldflags`" | ||
| - LIBS+=" `$LIBRSB_CONFIG --libs --extra_libs`" | ||
| + CPPFLAGS="${CPPFLAGS} ` $LIBRSB_CONFIG --I_opts`" | ||
| + LDFLAGS="${LDFLAGS} `$LIBRSB_CONFIG --ldflags`" | ||
| + LIBS="${LIBS} `$LIBRSB_CONFIG --libs --extra_libs`" | ||
| fi | ||
| for ac_header in rsb.h | ||
| do : | ||
| @@ -16538,7 +16538,7 @@ fi | ||
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_cancel" >&5 | ||
| $as_echo "$ac_cv_lib_pthread_pthread_cancel" >&6; } | ||
| if test "x$ac_cv_lib_pthread_pthread_cancel" = xyes; then : | ||
| - LIBS+=" -lpthread"; | ||
| + LIBS="${LIBS} -lpthread"; | ||
| fi | ||
|
|
||
| { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lgtest" >&5 | ||
| @@ -16680,14 +16680,14 @@ fi | ||
| { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_stdcppfs_main" >&5 | ||
| $as_echo "$ac_cv_lib_stdcppfs_main" >&6; } | ||
| if test "x$ac_cv_lib_stdcppfs_main" = xyes; then : | ||
| - RGT_LDADD+=" -lstdc++fs"; | ||
| + RGT_LDADD="${RGT_LDADD} -lstdc++fs"; | ||
| fi | ||
| else | ||
| rsb_have_gtest=0; | ||
| fi | ||
| if test x"$want_rsblib" != x"no" ; then | ||
| # adding this now: assuming configure called *before* librsb.la built. | ||
| - LIBS+=" ${LIBRSB_LOCAL_LIBS}" | ||
| + LIBS="${LIBS} ${LIBRSB_LOCAL_LIBS}" | ||
| fi | ||
| RGT_LDADD="$RGT_LDADD" | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters