Skip to content

Commit

Permalink
Revert "xbps-src: fix build-options via cmdline."
Browse files Browse the repository at this point in the history 
Needed to load XBPS_PKG_OPTIONS_foo.

This reverts commit 47175dc.
  • Loading branch information
@Chocimier
Chocimier committed Sep 7, 2020
1 parent dd68e51 commit 52781a3
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions common/xbps-src/shutils/common.sh
View file
Expand Up @@ -326,6 +326,8 @@ setup_pkg() {

unset_package_funcs

. $XBPS_CONFIG_FILE 2>/dev/null

if [ -n "$cross" ]; then
source_file $XBPS_CROSSPFDIR/${cross}.sh

Expand Down

4 comments on commit 52781a3

@Johnnynator
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sourcing the config file this late breaks other stuff like passing make jobs in the command line.

@q66
Copy link
Contributor

@q66 q66 commented on 52781a3 Sep 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, this will break various things, why was this committed without prior discussion?

@ericonr
Copy link
Member

@ericonr ericonr commented on 52781a3 Sep 9, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#24524

@Chocimier
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs to be done that late to handle options of dependencies of target package. Experimenting with sourcing in subshell.

Please sign in to comment.