[lng-odp-dpk,12/24] configure: libodphelper name correction from merge conflict

Message ID 1491483222-32154-3-git-send-email-balakrishna.garapati@linaro.org
State New
Headers show
Series
  • Untitled series #123
Related show

Commit Message

Krishna Garapati April 6, 2017, 12:53 p.m.
Signed-off-by: Balakrishna Garapati <balakrishna.garapati@linaro.org>
---
 configure.ac                 | 2 +-
 test/Makefile.inc            | 2 +-
 test/linux-dpdk/Makefile.inc | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Comments

Yi He April 7, 2017, 7:42 a.m. | #1
On 6 April 2017 at 20:53, Balakrishna Garapati <
balakrishna.garapati@linaro.org> wrote:

> Signed-off-by: Balakrishna Garapati <balakrishna.garapati@linaro.org>
> ---
>  configure.ac                 | 2 +-
>  test/Makefile.inc            | 2 +-
>  test/linux-dpdk/Makefile.inc | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 476c92f..6fa7f97 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -332,7 +332,7 @@ AM_CXXFLAGS="-std=c++11"
>
>  AC_CONFIG_FILES([Makefile
>                  pkgconfig/libodp-dpdk.pc
> -                pkgconfig/libodphelper-linux.pc
> +                pkgconfig/libodphelper-linux-generic.pc
>

1) I did not find the pkgconfig/libodphelper-linux-generic.pc in pulled
odp-dpdk master, may I review this patch series based on wrong branch, I'll
stop here and wait for your comment.


>                  ])
>
>  AC_SEARCH_LIBS([timer_create],[rt posix4])
> diff --git a/test/Makefile.inc b/test/Makefile.inc
> index 2556fd3..063b04b 100644
> --- a/test/Makefile.inc
> +++ b/test/Makefile.inc
> @@ -4,7 +4,7 @@ LIB   = $(top_builddir)/lib
>  #in the following line, the libs using the symbols should come before
>  #the libs containing them! The includer is given a chance to add things
>  #before libodp by setting PRE_LDADD before the inclusion.
> -LDADD = $(PRE_LDADD) $(LIB)/libodphelper-linux.la $(LIB)/libodp-dpdk.la
> +LDADD = $(PRE_LDADD) $(LIB)/libodphelper.la $(LIB)/libodp-dpdk.la
>
>  INCFLAGS = \
>         -I$(top_builddir)/platform/@with_platform@/include \
> diff --git a/test/linux-dpdk/Makefile.inc b/test/linux-dpdk/Makefile.inc
> index f2b3151..a24b936 100644
> --- a/test/linux-dpdk/Makefile.inc
> +++ b/test/linux-dpdk/Makefile.inc
> @@ -6,7 +6,7 @@ AM_LDFLAGS += -static
>
>  LIBCUNIT_COMMON = $(top_builddir)/test/common_plat/common/
> libcunit_common.la
>  LIB   = $(top_builddir)/lib
> -LIBODP = $(LIB)/libodphelper-linux.la $(LIB)/libodp-dpdk.la
> +LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-dpdk.la
>
>  INCCUNIT_COMMON = -I$(top_srcdir)/test/common_plat/common
>  INCODP = -I$(top_builddir)/platform/@with_platform@/include \
> --
> 1.9.1
>
> _______________________________________________
> lng-odp-dpdk mailing list
> lng-odp-dpdk@lists.linaro.org
> https://lists.linaro.org/mailman/listinfo/lng-odp-dpdk
>
Krishna Garapati April 10, 2017, 6 a.m. | #2
On 7 April 2017 at 09:42, Yi He <yi.he@linaro.org> wrote:

>
>
> On 6 April 2017 at 20:53, Balakrishna Garapati <
> balakrishna.garapati@linaro.org> wrote:
>
>> Signed-off-by: Balakrishna Garapati <balakrishna.garapati@linaro.org>
>> ---
>>  configure.ac                 | 2 +-
>>  test/Makefile.inc            | 2 +-
>>  test/linux-dpdk/Makefile.inc | 2 +-
>>  3 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/configure.ac b/configure.ac
>> index 476c92f..6fa7f97 100644
>> --- a/configure.ac
>> +++ b/configure.ac
>> @@ -332,7 +332,7 @@ AM_CXXFLAGS="-std=c++11"
>>
>>  AC_CONFIG_FILES([Makefile
>>                  pkgconfig/libodp-dpdk.pc
>> -                pkgconfig/libodphelper-linux.pc
>> +                pkgconfig/libodphelper-linux-generic.pc
>>
>
> 1) I did not find the pkgconfig/libodphelper-linux-generic.pc in pulled
> odp-dpdk master, may I review this patch series based on wrong branch, I'll
> stop here and wait for your comment.
>
This comes from the odp v1.14 merge. Have you made a merge from odp v1.14
to odp-dpdk before applying the patch series ?. /Krishna

>
>
>>                  ])
>>
>>  AC_SEARCH_LIBS([timer_create],[rt posix4])
>> diff --git a/test/Makefile.inc b/test/Makefile.inc
>> index 2556fd3..063b04b 100644
>> --- a/test/Makefile.inc
>> +++ b/test/Makefile.inc
>> @@ -4,7 +4,7 @@ LIB   = $(top_builddir)/lib
>>  #in the following line, the libs using the symbols should come before
>>  #the libs containing them! The includer is given a chance to add things
>>  #before libodp by setting PRE_LDADD before the inclusion.
>> -LDADD = $(PRE_LDADD) $(LIB)/libodphelper-linux.la $(LIB)/libodp-dpdk.la
>> +LDADD = $(PRE_LDADD) $(LIB)/libodphelper.la $(LIB)/libodp-dpdk.la
>>
>>  INCFLAGS = \
>>         -I$(top_builddir)/platform/@with_platform@/include \
>> diff --git a/test/linux-dpdk/Makefile.inc b/test/linux-dpdk/Makefile.inc
>> index f2b3151..a24b936 100644
>> --- a/test/linux-dpdk/Makefile.inc
>> +++ b/test/linux-dpdk/Makefile.inc
>> @@ -6,7 +6,7 @@ AM_LDFLAGS += -static
>>
>>  LIBCUNIT_COMMON = $(top_builddir)/test/common_plat/common/
>> libcunit_common.la
>>  LIB   = $(top_builddir)/lib
>> -LIBODP = $(LIB)/libodphelper-linux.la $(LIB)/libodp-dpdk.la
>> +LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-dpdk.la
>>
>>  INCCUNIT_COMMON = -I$(top_srcdir)/test/common_plat/common
>>  INCODP = -I$(top_builddir)/platform/@with_platform@/include \
>> --
>> 1.9.1
>>
>> _______________________________________________
>> lng-odp-dpdk mailing list
>> lng-odp-dpdk@lists.linaro.org
>> https://lists.linaro.org/mailman/listinfo/lng-odp-dpdk
>>
>
>
Yi He April 10, 2017, 7 a.m. | #3
Hi, Krishna

I cloned the odp-dpdk repo and working on the master branch. Did it merge
odp v1.14 or on a different branch? Or I need to manually do merge before
applying this patch series? How to do that manually?

If a manual merge is needed, shall that be a prerequisite patch series
before this patch series?

Best Regards, Yi

On 10 April 2017 at 14:00, Krishna Garapati <balakrishna.garapati@linaro.org
> wrote:

>
>
> On 7 April 2017 at 09:42, Yi He <yi.he@linaro.org> wrote:
>
>>
>>
>> On 6 April 2017 at 20:53, Balakrishna Garapati <
>> balakrishna.garapati@linaro.org> wrote:
>>
>>> Signed-off-by: Balakrishna Garapati <balakrishna.garapati@linaro.org>
>>> ---
>>>  configure.ac                 | 2 +-
>>>  test/Makefile.inc            | 2 +-
>>>  test/linux-dpdk/Makefile.inc | 2 +-
>>>  3 files changed, 3 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/configure.ac b/configure.ac
>>> index 476c92f..6fa7f97 100644
>>> --- a/configure.ac
>>> +++ b/configure.ac
>>> @@ -332,7 +332,7 @@ AM_CXXFLAGS="-std=c++11"
>>>
>>>  AC_CONFIG_FILES([Makefile
>>>                  pkgconfig/libodp-dpdk.pc
>>> -                pkgconfig/libodphelper-linux.pc
>>> +                pkgconfig/libodphelper-linux-generic.pc
>>>
>>
>> 1) I did not find the pkgconfig/libodphelper-linux-generic.pc in pulled
>> odp-dpdk master, may I review this patch series based on wrong branch, I'll
>> stop here and wait for your comment.
>>
> This comes from the odp v1.14 merge. Have you made a merge from odp v1.14
> to odp-dpdk before applying the patch series ?. /Krishna
>
>>
>>
>>>                  ])
>>>
>>>  AC_SEARCH_LIBS([timer_create],[rt posix4])
>>> diff --git a/test/Makefile.inc b/test/Makefile.inc
>>> index 2556fd3..063b04b 100644
>>> --- a/test/Makefile.inc
>>> +++ b/test/Makefile.inc
>>> @@ -4,7 +4,7 @@ LIB   = $(top_builddir)/lib
>>>  #in the following line, the libs using the symbols should come before
>>>  #the libs containing them! The includer is given a chance to add things
>>>  #before libodp by setting PRE_LDADD before the inclusion.
>>> -LDADD = $(PRE_LDADD) $(LIB)/libodphelper-linux.la $(LIB)/libodp-dpdk.la
>>> +LDADD = $(PRE_LDADD) $(LIB)/libodphelper.la $(LIB)/libodp-dpdk.la
>>>
>>>  INCFLAGS = \
>>>         -I$(top_builddir)/platform/@with_platform@/include \
>>> diff --git a/test/linux-dpdk/Makefile.inc b/test/linux-dpdk/Makefile.inc
>>> index f2b3151..a24b936 100644
>>> --- a/test/linux-dpdk/Makefile.inc
>>> +++ b/test/linux-dpdk/Makefile.inc
>>> @@ -6,7 +6,7 @@ AM_LDFLAGS += -static
>>>
>>>  LIBCUNIT_COMMON = $(top_builddir)/test/common_plat/common/
>>> libcunit_common.la
>>>  LIB   = $(top_builddir)/lib
>>> -LIBODP = $(LIB)/libodphelper-linux.la $(LIB)/libodp-dpdk.la
>>> +LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-dpdk.la
>>>
>>>  INCCUNIT_COMMON = -I$(top_srcdir)/test/common_plat/common
>>>  INCODP = -I$(top_builddir)/platform/@with_platform@/include \
>>> --
>>> 1.9.1
>>>
>>> _______________________________________________
>>> lng-odp-dpdk mailing list
>>> lng-odp-dpdk@lists.linaro.org
>>> https://lists.linaro.org/mailman/listinfo/lng-odp-dpdk
>>>
>>
>>
>
Krishna Garapati April 10, 2017, 8:50 a.m. | #4
On 10 April 2017 at 09:00, Yi He <yi.he@linaro.org> wrote:

> Hi, Krishna
>
> I cloned the odp-dpdk repo and working on the master branch. Did it merge
> odp v1.14 or on a different branch? Or I need to manually do merge before
> applying this patch series? How to do that manually?
>
Yes manual merge is needed. I have now put the git repo (which has this
merge included) on Linaro git.
Please clone -
https://git.linaro.org/people/balakrishna.garapati/odp-dpdk.git and
checkout
the branch - "odp_dpdk_v1.14_review_branch
<https://git.linaro.org/people/balakrishna.garapati/odp-dpdk.git/log/?h=odp_dpdk_v1.14_review_branch>"
and apply the patch series.

>
> If a manual merge is needed, shall that be a prerequisite patch series
> before this patch series?
>
Yes it's a pre-requisite. I should have mentioned that on the cover letter,
my mistake. I am going to send out V2 with changes you have mentioned and
put the above info into the cover letter.

/Krishna

>
> Best Regards, Yi
>
> On 10 April 2017 at 14:00, Krishna Garapati <balakrishna.garapati@linaro.
> org> wrote:
>
>>
>>
>> On 7 April 2017 at 09:42, Yi He <yi.he@linaro.org> wrote:
>>
>>>
>>>
>>> On 6 April 2017 at 20:53, Balakrishna Garapati <
>>> balakrishna.garapati@linaro.org> wrote:
>>>
>>>> Signed-off-by: Balakrishna Garapati <balakrishna.garapati@linaro.org>
>>>> ---
>>>>  configure.ac                 | 2 +-
>>>>  test/Makefile.inc            | 2 +-
>>>>  test/linux-dpdk/Makefile.inc | 2 +-
>>>>  3 files changed, 3 insertions(+), 3 deletions(-)
>>>>
>>>> diff --git a/configure.ac b/configure.ac
>>>> index 476c92f..6fa7f97 100644
>>>> --- a/configure.ac
>>>> +++ b/configure.ac
>>>> @@ -332,7 +332,7 @@ AM_CXXFLAGS="-std=c++11"
>>>>
>>>>  AC_CONFIG_FILES([Makefile
>>>>                  pkgconfig/libodp-dpdk.pc
>>>> -                pkgconfig/libodphelper-linux.pc
>>>> +                pkgconfig/libodphelper-linux-generic.pc
>>>>
>>>
>>> 1) I did not find the pkgconfig/libodphelper-linux-generic.pc in pulled
>>> odp-dpdk master, may I review this patch series based on wrong branch, I'll
>>> stop here and wait for your comment.
>>>
>> This comes from the odp v1.14 merge. Have you made a merge from odp v1.14
>> to odp-dpdk before applying the patch series ?. /Krishna
>>
>>>
>>>
>>>>                  ])
>>>>
>>>>  AC_SEARCH_LIBS([timer_create],[rt posix4])
>>>> diff --git a/test/Makefile.inc b/test/Makefile.inc
>>>> index 2556fd3..063b04b 100644
>>>> --- a/test/Makefile.inc
>>>> +++ b/test/Makefile.inc
>>>> @@ -4,7 +4,7 @@ LIB   = $(top_builddir)/lib
>>>>  #in the following line, the libs using the symbols should come before
>>>>  #the libs containing them! The includer is given a chance to add things
>>>>  #before libodp by setting PRE_LDADD before the inclusion.
>>>> -LDADD = $(PRE_LDADD) $(LIB)/libodphelper-linux.la $(LIB)/
>>>> libodp-dpdk.la
>>>> +LDADD = $(PRE_LDADD) $(LIB)/libodphelper.la $(LIB)/libodp-dpdk.la
>>>>
>>>>  INCFLAGS = \
>>>>         -I$(top_builddir)/platform/@with_platform@/include \
>>>> diff --git a/test/linux-dpdk/Makefile.inc b/test/linux-dpdk/Makefile.inc
>>>> index f2b3151..a24b936 100644
>>>> --- a/test/linux-dpdk/Makefile.inc
>>>> +++ b/test/linux-dpdk/Makefile.inc
>>>> @@ -6,7 +6,7 @@ AM_LDFLAGS += -static
>>>>
>>>>  LIBCUNIT_COMMON = $(top_builddir)/test/common_plat/common/
>>>> libcunit_common.la
>>>>  LIB   = $(top_builddir)/lib
>>>> -LIBODP = $(LIB)/libodphelper-linux.la $(LIB)/libodp-dpdk.la
>>>> +LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-dpdk.la
>>>>
>>>>  INCCUNIT_COMMON = -I$(top_srcdir)/test/common_plat/common
>>>>  INCODP = -I$(top_builddir)/platform/@with_platform@/include \
>>>> --
>>>> 1.9.1
>>>>
>>>> _______________________________________________
>>>> lng-odp-dpdk mailing list
>>>> lng-odp-dpdk@lists.linaro.org
>>>> https://lists.linaro.org/mailman/listinfo/lng-odp-dpdk
>>>>
>>>
>>>
>>
>
Yi He April 10, 2017, 9:01 a.m. | #5
Thanks Krishna for the instructions, I'll continue review for 12 ~ 24 and
will finish tomorrow, if you'd like to wait one more day before composing
the v2, if I'll have extra comments :).

Thanks and best regards, Yi

On 10 April 2017 at 16:50, Krishna Garapati <balakrishna.garapati@linaro.org
> wrote:

>
>
> On 10 April 2017 at 09:00, Yi He <yi.he@linaro.org> wrote:
>
>> Hi, Krishna
>>
>> I cloned the odp-dpdk repo and working on the master branch. Did it merge
>> odp v1.14 or on a different branch? Or I need to manually do merge before
>> applying this patch series? How to do that manually?
>>
> Yes manual merge is needed. I have now put the git repo (which has this
> merge included) on Linaro git.
> Please clone - https://git.linaro.org/people/
> balakrishna.garapati/odp-dpdk.git and checkout
> the branch - "odp_dpdk_v1.14_review_branch
> <https://git.linaro.org/people/balakrishna.garapati/odp-dpdk.git/log/?h=odp_dpdk_v1.14_review_branch>"
> and apply the patch series.
>
>>
>> If a manual merge is needed, shall that be a prerequisite patch series
>> before this patch series?
>>
> Yes it's a pre-requisite. I should have mentioned that on the cover
> letter, my mistake. I am going to send out V2 with changes you have
> mentioned and put the above info into the cover letter.
>
> /Krishna
>
>>
>> Best Regards, Yi
>>
>> On 10 April 2017 at 14:00, Krishna Garapati <
>> balakrishna.garapati@linaro.org> wrote:
>>
>>>
>>>
>>> On 7 April 2017 at 09:42, Yi He <yi.he@linaro.org> wrote:
>>>
>>>>
>>>>
>>>> On 6 April 2017 at 20:53, Balakrishna Garapati <
>>>> balakrishna.garapati@linaro.org> wrote:
>>>>
>>>>> Signed-off-by: Balakrishna Garapati <balakrishna.garapati@linaro.org>
>>>>> ---
>>>>>  configure.ac                 | 2 +-
>>>>>  test/Makefile.inc            | 2 +-
>>>>>  test/linux-dpdk/Makefile.inc | 2 +-
>>>>>  3 files changed, 3 insertions(+), 3 deletions(-)
>>>>>
>>>>> diff --git a/configure.ac b/configure.ac
>>>>> index 476c92f..6fa7f97 100644
>>>>> --- a/configure.ac
>>>>> +++ b/configure.ac
>>>>> @@ -332,7 +332,7 @@ AM_CXXFLAGS="-std=c++11"
>>>>>
>>>>>  AC_CONFIG_FILES([Makefile
>>>>>                  pkgconfig/libodp-dpdk.pc
>>>>> -                pkgconfig/libodphelper-linux.pc
>>>>> +                pkgconfig/libodphelper-linux-generic.pc
>>>>>
>>>>
>>>> 1) I did not find the pkgconfig/libodphelper-linux-generic.pc in
>>>> pulled odp-dpdk master, may I review this patch series based on wrong
>>>> branch, I'll stop here and wait for your comment.
>>>>
>>> This comes from the odp v1.14 merge. Have you made a merge from odp
>>> v1.14 to odp-dpdk before applying the patch series ?. /Krishna
>>>
>>>>
>>>>
>>>>>                  ])
>>>>>
>>>>>  AC_SEARCH_LIBS([timer_create],[rt posix4])
>>>>> diff --git a/test/Makefile.inc b/test/Makefile.inc
>>>>> index 2556fd3..063b04b 100644
>>>>> --- a/test/Makefile.inc
>>>>> +++ b/test/Makefile.inc
>>>>> @@ -4,7 +4,7 @@ LIB   = $(top_builddir)/lib
>>>>>  #in the following line, the libs using the symbols should come before
>>>>>  #the libs containing them! The includer is given a chance to add
>>>>> things
>>>>>  #before libodp by setting PRE_LDADD before the inclusion.
>>>>> -LDADD = $(PRE_LDADD) $(LIB)/libodphelper-linux.la $(LIB)/
>>>>> libodp-dpdk.la
>>>>> +LDADD = $(PRE_LDADD) $(LIB)/libodphelper.la $(LIB)/libodp-dpdk.la
>>>>>
>>>>>  INCFLAGS = \
>>>>>         -I$(top_builddir)/platform/@with_platform@/include \
>>>>> diff --git a/test/linux-dpdk/Makefile.inc
>>>>> b/test/linux-dpdk/Makefile.inc
>>>>> index f2b3151..a24b936 100644
>>>>> --- a/test/linux-dpdk/Makefile.inc
>>>>> +++ b/test/linux-dpdk/Makefile.inc
>>>>> @@ -6,7 +6,7 @@ AM_LDFLAGS += -static
>>>>>
>>>>>  LIBCUNIT_COMMON = $(top_builddir)/test/common_plat/common/
>>>>> libcunit_common.la
>>>>>  LIB   = $(top_builddir)/lib
>>>>> -LIBODP = $(LIB)/libodphelper-linux.la $(LIB)/libodp-dpdk.la
>>>>> +LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-dpdk.la
>>>>>
>>>>>  INCCUNIT_COMMON = -I$(top_srcdir)/test/common_plat/common
>>>>>  INCODP = -I$(top_builddir)/platform/@with_platform@/include \
>>>>> --
>>>>> 1.9.1
>>>>>
>>>>> _______________________________________________
>>>>> lng-odp-dpdk mailing list
>>>>> lng-odp-dpdk@lists.linaro.org
>>>>> https://lists.linaro.org/mailman/listinfo/lng-odp-dpdk
>>>>>
>>>>
>>>>
>>>
>>
>
Krishna Garapati April 10, 2017, 9:14 a.m. | #6
On 10 April 2017 at 11:01, Yi He <yi.he@linaro.org> wrote:

> Thanks Krishna for the instructions, I'll continue review for 12 ~ 24 and
> will finish tomorrow, if you'd like to wait one more day before composing
> the v2, if I'll have extra comments :).
>
Sure, I will wait.

/Krishna

>
> Thanks and best regards, Yi
>
> On 10 April 2017 at 16:50, Krishna Garapati <balakrishna.garapati@linaro.
> org> wrote:
>
>>
>>
>> On 10 April 2017 at 09:00, Yi He <yi.he@linaro.org> wrote:
>>
>>> Hi, Krishna
>>>
>>> I cloned the odp-dpdk repo and working on the master branch. Did it
>>> merge odp v1.14 or on a different branch? Or I need to manually do merge
>>> before applying this patch series? How to do that manually?
>>>
>> Yes manual merge is needed. I have now put the git repo (which has this
>> merge included) on Linaro git.
>> Please clone - https://git.linaro.org/people/
>> balakrishna.garapati/odp-dpdk.git and checkout
>> the branch - "odp_dpdk_v1.14_review_branch
>> <https://git.linaro.org/people/balakrishna.garapati/odp-dpdk.git/log/?h=odp_dpdk_v1.14_review_branch>"
>> and apply the patch series.
>>
>>>
>>> If a manual merge is needed, shall that be a prerequisite patch series
>>> before this patch series?
>>>
>> Yes it's a pre-requisite. I should have mentioned that on the cover
>> letter, my mistake. I am going to send out V2 with changes you have
>> mentioned and put the above info into the cover letter.
>>
>> /Krishna
>>
>>>
>>> Best Regards, Yi
>>>
>>> On 10 April 2017 at 14:00, Krishna Garapati <
>>> balakrishna.garapati@linaro.org> wrote:
>>>
>>>>
>>>>
>>>> On 7 April 2017 at 09:42, Yi He <yi.he@linaro.org> wrote:
>>>>
>>>>>
>>>>>
>>>>> On 6 April 2017 at 20:53, Balakrishna Garapati <
>>>>> balakrishna.garapati@linaro.org> wrote:
>>>>>
>>>>>> Signed-off-by: Balakrishna Garapati <balakrishna.garapati@linaro.org>
>>>>>> ---
>>>>>>  configure.ac                 | 2 +-
>>>>>>  test/Makefile.inc            | 2 +-
>>>>>>  test/linux-dpdk/Makefile.inc | 2 +-
>>>>>>  3 files changed, 3 insertions(+), 3 deletions(-)
>>>>>>
>>>>>> diff --git a/configure.ac b/configure.ac
>>>>>> index 476c92f..6fa7f97 100644
>>>>>> --- a/configure.ac
>>>>>> +++ b/configure.ac
>>>>>> @@ -332,7 +332,7 @@ AM_CXXFLAGS="-std=c++11"
>>>>>>
>>>>>>  AC_CONFIG_FILES([Makefile
>>>>>>                  pkgconfig/libodp-dpdk.pc
>>>>>> -                pkgconfig/libodphelper-linux.pc
>>>>>> +                pkgconfig/libodphelper-linux-generic.pc
>>>>>>
>>>>>
>>>>> 1) I did not find the pkgconfig/libodphelper-linux-generic.pc in
>>>>> pulled odp-dpdk master, may I review this patch series based on wrong
>>>>> branch, I'll stop here and wait for your comment.
>>>>>
>>>> This comes from the odp v1.14 merge. Have you made a merge from odp
>>>> v1.14 to odp-dpdk before applying the patch series ?. /Krishna
>>>>
>>>>>
>>>>>
>>>>>>                  ])
>>>>>>
>>>>>>  AC_SEARCH_LIBS([timer_create],[rt posix4])
>>>>>> diff --git a/test/Makefile.inc b/test/Makefile.inc
>>>>>> index 2556fd3..063b04b 100644
>>>>>> --- a/test/Makefile.inc
>>>>>> +++ b/test/Makefile.inc
>>>>>> @@ -4,7 +4,7 @@ LIB   = $(top_builddir)/lib
>>>>>>  #in the following line, the libs using the symbols should come before
>>>>>>  #the libs containing them! The includer is given a chance to add
>>>>>> things
>>>>>>  #before libodp by setting PRE_LDADD before the inclusion.
>>>>>> -LDADD = $(PRE_LDADD) $(LIB)/libodphelper-linux.la $(LIB)/
>>>>>> libodp-dpdk.la
>>>>>> +LDADD = $(PRE_LDADD) $(LIB)/libodphelper.la $(LIB)/libodp-dpdk.la
>>>>>>
>>>>>>  INCFLAGS = \
>>>>>>         -I$(top_builddir)/platform/@with_platform@/include \
>>>>>> diff --git a/test/linux-dpdk/Makefile.inc
>>>>>> b/test/linux-dpdk/Makefile.inc
>>>>>> index f2b3151..a24b936 100644
>>>>>> --- a/test/linux-dpdk/Makefile.inc
>>>>>> +++ b/test/linux-dpdk/Makefile.inc
>>>>>> @@ -6,7 +6,7 @@ AM_LDFLAGS += -static
>>>>>>
>>>>>>  LIBCUNIT_COMMON = $(top_builddir)/test/common_plat/common/
>>>>>> libcunit_common.la
>>>>>>  LIB   = $(top_builddir)/lib
>>>>>> -LIBODP = $(LIB)/libodphelper-linux.la $(LIB)/libodp-dpdk.la
>>>>>> +LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-dpdk.la
>>>>>>
>>>>>>  INCCUNIT_COMMON = -I$(top_srcdir)/test/common_plat/common
>>>>>>  INCODP = -I$(top_builddir)/platform/@with_platform@/include \
>>>>>> --
>>>>>> 1.9.1
>>>>>>
>>>>>> _______________________________________________
>>>>>> lng-odp-dpdk mailing list
>>>>>> lng-odp-dpdk@lists.linaro.org
>>>>>> https://lists.linaro.org/mailman/listinfo/lng-odp-dpdk
>>>>>>
>>>>>
>>>>>
>>>>
>>>
>>
>

Patch hide | download patch | download mbox

diff --git a/configure.ac b/configure.ac
index 476c92f..6fa7f97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -332,7 +332,7 @@  AM_CXXFLAGS="-std=c++11"
 
 AC_CONFIG_FILES([Makefile
 		 pkgconfig/libodp-dpdk.pc
-		 pkgconfig/libodphelper-linux.pc
+		 pkgconfig/libodphelper-linux-generic.pc
 		 ])
 
 AC_SEARCH_LIBS([timer_create],[rt posix4])
diff --git a/test/Makefile.inc b/test/Makefile.inc
index 2556fd3..063b04b 100644
--- a/test/Makefile.inc
+++ b/test/Makefile.inc
@@ -4,7 +4,7 @@  LIB   = $(top_builddir)/lib
 #in the following line, the libs using the symbols should come before
 #the libs containing them! The includer is given a chance to add things
 #before libodp by setting PRE_LDADD before the inclusion.
-LDADD = $(PRE_LDADD) $(LIB)/libodphelper-linux.la $(LIB)/libodp-dpdk.la
+LDADD = $(PRE_LDADD) $(LIB)/libodphelper.la $(LIB)/libodp-dpdk.la
 
 INCFLAGS = \
 	-I$(top_builddir)/platform/@with_platform@/include \
diff --git a/test/linux-dpdk/Makefile.inc b/test/linux-dpdk/Makefile.inc
index f2b3151..a24b936 100644
--- a/test/linux-dpdk/Makefile.inc
+++ b/test/linux-dpdk/Makefile.inc
@@ -6,7 +6,7 @@  AM_LDFLAGS += -static
 
 LIBCUNIT_COMMON = $(top_builddir)/test/common_plat/common/libcunit_common.la
 LIB   = $(top_builddir)/lib
-LIBODP = $(LIB)/libodphelper-linux.la $(LIB)/libodp-dpdk.la
+LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-dpdk.la
 
 INCCUNIT_COMMON = -I$(top_srcdir)/test/common_plat/common
 INCODP = -I$(top_builddir)/platform/@with_platform@/include \