Skip to content

dist/tools/mosquitto_rsmb: fix stand-alone build#14287

Merged
fjmolinas merged 1 commit intoRIOT-OS:masterfrom
aabadie:pr/tools/mosquitto_rsmb_standalone_build_fix
Jun 16, 2020
Merged

dist/tools/mosquitto_rsmb: fix stand-alone build#14287
fjmolinas merged 1 commit intoRIOT-OS:masterfrom
aabadie:pr/tools/mosquitto_rsmb_standalone_build_fix

Conversation

@aabadie
Copy link
Copy Markdown
Contributor

@aabadie aabadie commented Jun 15, 2020

Contribution description

This PR is a small fix for the mosquitto_rsmb Makefile when it is used stand-alone, when called directly using make -C dist/tools/mosquitto_rsmb.

In the Makefile, pkg.mk is included before RIOTBASE is set so in the stand-alone scenario, this fails.

Testing procedure

  • Run make -C dist/tools/mosquitto_rsmb:
master
make -C dist/tools/mosquitto_rsmb --no-print-directory 
/work/riot/RIOT/dist/tools/mosquitto_rsmb/../../..
Makefile:7: /pkg/pkg.mk: No such file or directory
make: *** No rule to make target '/pkg/pkg.mk'.  Stop.
this PR
make -C dist/tools/mosquitto_rsmb --no-print-directory 
[INFO] cloning mosquitto_rsmb
rm -Rf /work/riot/RIOT/dist/tools/mosquitto_rsmb/bin
mkdir -p /work/riot/RIOT/dist/tools/mosquitto_rsmb/bin
/work/riot/RIOT/dist/tools/mosquitto_rsmb/../git/git-cache clone https://github.com/eclipse/mosquitto.rsmb 9b99a3be9a26635b93aec8fa2ed744e8c49e7262 /work/riot/RIOT/dist/tools/mosquitto_rsmb/bin
Cloning into '/work/riot/RIOT/dist/tools/mosquitto_rsmb/bin'...
remote: Enumerating objects: 332, done.
remote: Total 332 (delta 0), reused 0 (delta 0), pack-reused 332
Receiving objects: 100% (332/332), 271.72 KiB | 706.00 KiB/s, done.
Resolving deltas: 100% (180/180), done.
HEAD is now at 9b99a3b Created a Markdown formatted README (#25)
[INFO] updating mosquitto_rsmb /work/riot/RIOT/dist/tools/mosquitto_rsmb/bin/.pkg-state.git-downloaded
git -C /work/riot/RIOT/dist/tools/mosquitto_rsmb/bin --git-dir=.git --work-tree=. fetch  https://github.com/eclipse/mosquitto.rsmb 9b99a3be9a26635b93aec8fa2ed744e8c49e7262
From https://github.com/eclipse/mosquitto.rsmb
 * branch            9b99a3be9a26635b93aec8fa2ed744e8c49e7262 -> FETCH_HEAD
echo 9b99a3be9a26635b93aec8fa2ed744e8c49e7262 > /work/riot/RIOT/dist/tools/mosquitto_rsmb/bin/.pkg-state.git-downloaded
[INFO] patch mosquitto_rsmb
git -C /work/riot/RIOT/dist/tools/mosquitto_rsmb/bin --git-dir=.git --work-tree=. clean  -xdff '**' ':!.pkg-state.git*'
git -C /work/riot/RIOT/dist/tools/mosquitto_rsmb/bin --git-dir=.git --work-tree=. checkout  -f 9b99a3be9a26635b93aec8fa2ed744e8c49e7262
HEAD is now at 9b99a3b Created a Markdown formatted README (#25)
git -C /work/riot/RIOT/dist/tools/mosquitto_rsmb/bin --git-dir=.git --work-tree=. -c user.email=buildsystem@riot -c user.name="RIOT buildsystem" am  --no-gpg-sign --ignore-whitespace --whitespace=nowarn  </dev/null
env -i PATH=/home/aabadie/.local/bin:/work/tools/mips-mti-elf/2016.05-03/bin:/work/tools/avr8-gnu-toolchain-linux_x86_64/bin:/work/tools/riscv-none-gcc/8.2.0-2.2-20190521-0004/bin:/work/tools/gcc-arm-none-eabi-9-2019-q4-major/bin/:/home/aabadie/.cargo/bin:/home/aabadie/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/work/tools/packer TERM=xterm-256color "make" -C /work/riot/RIOT/dist/tools/mosquitto_rsmb/bin/rsmb/src
make: Entering directory '/work/riot/RIOT/dist/tools/mosquitto_rsmb/bin/rsmb/src'
cc -Wall -Os *.c -o broker
cc -Wall -ggdb *.c -o broker_dbg
cc -DMQTTS -Wall -Os *.c -o broker_mqtts
MQTTProtocolClient.c: In function 'MQTTProtocol_processQueued':
MQTTProtocolClient.c:658:4: warning: this 'if' clause does not guard... [-Wmisleading-indentation]
  658 |    if (client->pendingRegistration == NULL)
      |    ^~
MQTTProtocolClient.c:660:5: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if'
  660 |     goto exit;
      |     ^~~~
MQTTSProtocol.c: In function 'MQTTSProtocol_handleAdvertises':
MQTTSProtocol.c:273:2: warning: 'ftime' is deprecated [-Wdeprecated-declarations]
  273 |  ftime(&ts);
      |  ^~~~~
In file included from MQTTSProtocol.c:39:
/usr/include/x86_64-linux-gnu/sys/timeb.h:39:12: note: declared here
   39 | extern int ftime (struct timeb *__timebuf)
      |            ^~~~~
perl tools/be/be.pl
make: Leaving directory '/work/riot/RIOT/dist/tools/mosquitto_rsmb/bin/rsmb/src'
cp /work/riot/RIOT/dist/tools/mosquitto_rsmb/bin/rsmb/src/broker_mqtts /work/riot/RIOT/dist/tools/mosquitto_rsmb/mosquitto_rsmb
cp /work/riot/RIOT/dist/tools/mosquitto_rsmb/bin/rsmb/src/Messages.1.* /work/riot/RIOT/dist/tools/mosquitto_rsmb/

Issues/PRs references

None

@aabadie aabadie added Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) Area: build system Area: Build system CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Area: tools Area: Supplementary tools labels Jun 15, 2020
Copy link
Copy Markdown
Contributor

@fjmolinas fjmolinas left a comment

Choose a reason for hiding this comment

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

ACK, able to reproduce, and this PR indeed fixes it

make -C dist/tools/mosquitto_rsmb --no-print-directory
[INFO] cloning mosquitto_rsmb
rm -Rf /home/francisco/workspace/RIOT/dist/tools/mosquitto_rsmb/bin
mkdir -p /home/francisco/workspace/RIOT/dist/tools/mosquitto_rsmb/bin
/home/francisco/workspace/RIOT/dist/tools/mosquitto_rsmb/../git/git-cache clone 

@fjmolinas fjmolinas merged commit c819acd into RIOT-OS:master Jun 16, 2020
@aabadie aabadie deleted the pr/tools/mosquitto_rsmb_standalone_build_fix branch June 22, 2020 08:45
@miri64 miri64 added this to the Release 2020.07 milestone Jun 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area: build system Area: Build system Area: tools Area: Supplementary tools CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants