#50900 Ticket 50900 - Fix cargo offline build
Closed a year ago by spichugi. Opened 2 years ago by firstyear.
firstyear/389-ds-base 20200217-missing-plus  into  master

file modified
+1 -1
@@ -2180,7 +2180,7 @@ 

  	$(NSPR_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET) $(THREADLIB) $(SYSTEMD_LIBS) $(EVENT_LINK)

  if RUST_ENABLE

  ns_slapd_LDADD += $(RNSSLAPD_LIB)

- ns_slapd_CPPFLAGS = -lssl -lcrypto

+ ns_slapd_CPPFLAGS += -lssl -lcrypto

  endif

  ns_slapd_DEPENDENCIES = libslapd.la libldaputil.la

  # We need to link ns-slapd with the C++ compiler on HP-UX since we load

file modified
+7 -8
@@ -91,6 +91,11 @@ 

  AC_MSG_RESULT($enable_rust_offline)

  AM_CONDITIONAL([RUST_ENABLE_OFFLINE],[test "$enable_rust_offline" = yes])

  

+ AS_IF([test "$enable_rust_offline" = yes],

+     [rust_vendor_sources="replace-with = \"vendored-sources\""],

+     [rust_vendor_sources=""])

+ AC_SUBST([rust_vendor_sources])

+ 

  AC_MSG_CHECKING(for --enable-rust)

  AC_ARG_ENABLE(rust, AS_HELP_STRING([--enable-rust], [Enable rust language features (default: no)]),

                [], [ enable_rust=no ])
@@ -104,14 +109,6 @@ 

      AS_IF([test "$CARGO" != "yes" -o "$RUSTC" != "yes"], [

        AC_MSG_FAILURE("Rust based plugins cannot be built cargo=$CARGO rustc=$RUSTC")

      ])

- 

-     if test "$enable_rust_offline" = yes; then

-         rust_vendor_sources = "replace-with = \"vendored-sources\""

-     else

-         rust_vendor_sources = ""

-     fi

-     AC_SUBST([rust_vendor_sources])

-     AC_CONFIG_FILES([.cargo/config])

  fi

  AC_SUBST([enable_rust])

  AM_CONDITIONAL([RUST_ENABLE],[test "$enable_rust" = yes -o "$enable_rust_offline" = yes])
@@ -925,5 +922,7 @@ 

  

  AC_CONFIG_FILES([Makefile rpm/389-ds-base.spec  ])

  

+ AC_CONFIG_FILES([.cargo/config])

+ 

  AC_OUTPUT

  

Bug Description: The cargo offline build was broken due to a missing
+ on the CPP flags to nsslapd, and because of a "space" between a
variable and the value in configure.ac.

Fix Description: Add the plus, remove the space.

https://pagure.io/389-ds-base/pull-request/50900

Author: William Brown william@blackhats.net.au

Review by: ???

rebased onto e12ed626aaa43359678653cbf36ea76975ac3ba5

2 years ago

Could you maybe move this part like 19 lines above, so that it is with its friends? :) Other than that, LGTM!

rebased onto 1671dc0

2 years ago

Done, thanks for the review!

Pull-Request has been merged by firstyear

2 years ago

389-ds-base is moving from Pagure to Github. This means that new issues and pull requests
will be accepted only in 389-ds-base's github repository.

This pull request has been cloned to Github as issue and is available here:
- https://github.com/389ds/389-ds-base/issues/3953

If you want to continue to work on the PR, please navigate to the github issue,
download the patch from the attachments and file a new pull request.

Thank you for understanding. We apologize for all inconvenience.

Pull-Request has been closed by spichugi

a year ago
Metadata