Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
proview
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Esteban Blanc
proview
Commits
f8006f36
Commit
f8006f36
authored
Nov 22, 2013
by
Claes Sjofors
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pwre build fix for libpcap
parent
d08bd91d
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
10 additions
and
6 deletions
+10
-6
otherio/exe/rt_powerlink/src/os_templ/link_rule.mk
otherio/exe/rt_powerlink/src/os_templ/link_rule.mk
+1
-1
otherio/exe/rt_powerlink_cn/src/os_templ/link_rule.mk
otherio/exe/rt_powerlink_cn/src/os_templ/link_rule.mk
+1
-1
otherio/exe/rt_powerlink_cn/src/rt_powerlink_cn.c
otherio/exe/rt_powerlink_cn/src/rt_powerlink_cn.c
+1
-1
otherio/lib/rt/src/os_linux/rt_epl.c
otherio/lib/rt/src/os_linux/rt_epl.c
+1
-1
otherio/lib/rt/src/os_linux/rt_io_m_epl_cnserver.c
otherio/lib/rt/src/os_linux/rt_io_m_epl_cnserver.c
+1
-1
otherio/lib/rt/src/os_linux/rt_io_m_epl_mn.c
otherio/lib/rt/src/os_linux/rt_io_m_epl_mn.c
+1
-1
src/tools/pwre/src/os_linux/pwre_configure.sh
src/tools/pwre/src/os_linux/pwre_configure.sh
+4
-0
No files found.
otherio/exe/rt_powerlink/src/os_templ/link_rule.mk
View file @
f8006f36
...
...
@@ -5,5 +5,5 @@ link_rule_mk := 1
$(export_obj)
$(pwr_eobj)
/rt_io_user.o
\
$(pwre_conf_libdir)
$(pwre_conf_libpwrrt)
$(pwre_conf_lib)
\
-lpwr_usbio_dummy
-lpwr_usb_dummy
-lpwr_cifx_dummy
-lpwr_nodave_dummy
\
$(pwre_conf_libpwrprofibus)
$(pwre_conf_libpwrpowerlink)
-lpcap
$(pwre_conf_libpwrprofibus)
$(pwre_conf_libpwrpowerlink)
endif
otherio/exe/rt_powerlink_cn/src/os_templ/link_rule.mk
View file @
f8006f36
...
...
@@ -5,5 +5,5 @@ link_rule_mk := 1
$(export_obj)
$(pwr_eobj)
/rt_io_user.o
\
$(pwre_conf_libdir)
$(pwre_conf_libpwrrt)
$(pwre_conf_lib)
\
-lpwr_usbio_dummy
-lpwr_usb_dummy
-lpwr_cifx_dummy
-lpwr_nodave_dummy
\
$(pwre_conf_libpwrprofibus)
$(pwre_conf_libpwrpowerlinkcn)
-lpcap
$(pwre_conf_libpwrprofibus)
$(pwre_conf_libpwrpowerlinkcn)
endif
otherio/exe/rt_powerlink_cn/src/rt_powerlink_cn.c
View file @
f8006f36
...
...
@@ -34,7 +34,7 @@
* General Public License plus this exception.
**/
#if defined PWRE_CONF_EPL
#if defined PWRE_CONF_EPL
&& defined PWRE_CONF_LIBPCAP
#include "pwr.h"
#include "rt_io_msg.h"
...
...
otherio/lib/rt/src/os_linux/rt_epl.c
View file @
f8006f36
#if defined PWRE_CONF_EPL
#if defined PWRE_CONF_EPL
&& defined PWRE_CONF_LIBPCAP
#include "Epl.h"
...
...
otherio/lib/rt/src/os_linux/rt_io_m_epl_cnserver.c
View file @
f8006f36
...
...
@@ -52,7 +52,7 @@
#include "rt_io_m_epl.h"
#include "rt_io_bus.h"
#if defined PWRE_CONF_EPL
#if defined PWRE_CONF_EPL
&& defined PWRE_CONF_LIBPCAP
#include "Epl.h"
#include <errno.h>
...
...
otherio/lib/rt/src/os_linux/rt_io_m_epl_mn.c
View file @
f8006f36
...
...
@@ -46,7 +46,7 @@
#include "rt_io_m_epl.h"
#include "rt_io_bus.h"
#if defined PWRE_CONF_EPL
#if defined PWRE_CONF_EPL
&& defined PWRE_CONF_LIBPCAP
#include "Epl.h"
#include <errno.h>
...
...
src/tools/pwre/src/os_linux/pwre_configure.sh
View file @
f8006f36
...
...
@@ -171,6 +171,9 @@ pwre_config_check_lib()
conf_libpowerlink
=
$conf_libpowerlink
" -L
$lib_path
-l
${
lib
%.*
}
"
elif
test
$4
==
"powerlinkcn"
;
then
conf_libpowerlinkcn
=
$conf_libpowerlinkcn
" -L
$lib_path
-l
${
lib
%.*
}
"
elif
test
$4
==
"libpcap"
;
then
conf_libpowerlink
=
$conf_libpowerlink
" -l
${
lib
%.*
}
"
conf_libpowerlinkcn
=
$conf_libpowerlinkcn
" -l
${
lib
%.*
}
"
else
conf_lib
=
$conf_lib
" -l
${
lib
%%.*
}
"
fi
...
...
@@ -453,6 +456,7 @@ else
pwre_config_check_lib libusb LIBUSB lib libusb 1
"/usr/lib/libusb-1.0.so:/usr/lib/
$hwpl
-linux-
$gnu
/libusb-1.0.so"
pwre_config_check_lib powerlink POWERLINK lib powerlink 1
"
$epl
/build/Examples/X86/Generic/powerlink_user_lib/libpowerlink.a"
pwre_config_check_lib powerlinkcn POWERLINKCN lib powerlinkcn 1
"
$epl
/buildcn/Examples/X86/Generic/powerlink_user_lib/libpowerlink.a"
pwre_config_check_lib libpcap LIBPCAP lib libpcap 1
"/usr/lib/libpcap.so:/usr/lib/
$hwpl
-linux-
$gnu
/libpcap.so"
pwre_config_check_lib librsvg LIBRSVG lib librsvg 1
"/usr/lib/librsvg-2.so:/usr/lib/
$hwpl
-linux-
$gnu
/librsvg-2.so"
pwre_config_check_include mq MQ 0
"/usr/local/dmq/include/p_entry.h"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment